David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Mere overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-12-22 15:15:05 -08:00

..

bpfilter

…

netfilter

netfilter: nf_flow_table_offload: add IPv6 support

2019-11-15 23:44:47 +01:00

af_inet.c

net: port < inet_prot_sock(net) --> inet_port_requires_bind_service(net, port)

2019-11-26 13:20:46 -08:00

ah4.c

…

arp.c

…

cipso_ipv4.c

…

datagram.c

inet: stop leaking jiffies on the wire

2019-11-01 14:57:52 -07:00

devinet.c

inet: protect against too small mtu values.

2019-12-07 11:55:11 -08:00

esp4_offload.c

…

esp4.c

…

fib_frontend.c

ipv4: move fib4_has_custom_rules() helper to public header

2019-11-21 14:45:55 -08:00

fib_lookup.h

…

fib_notifier.c

net: fib_notifier: propagate extack down to the notifier block callback

2019-10-04 11:10:56 -07:00

fib_rules.c

net: fib_notifier: propagate extack down to the notifier block callback

2019-10-04 11:10:56 -07:00

fib_semantics.c

ipv4: Fix table id reference in fib_sync_down_addr

2019-11-07 16:14:36 -08:00

fib_trie.c

ipv4: Remove old route notifications and convert listeners

2019-12-16 16:14:43 -08:00

fou.c

…

gre_demux.c

gre: refetch erspan header from skb->data after pskb_may_pull()

2019-12-07 11:53:27 -08:00

gre_offload.c

…

icmp.c

net: icmp: fix data-race in cmp_global_allow()

2019-11-08 12:32:43 -08:00

igmp.c

igmp: uninline ip_mc_validate_checksum()

2019-10-04 14:26:46 -07:00

inet_connection_sock.c

net: annotate lockless accesses to sk->sk_max_ack_backlog

2019-11-06 16:14:48 -08:00

inet_diag.c

tcp/dccp: fix possible race __inet_lookup_established()

2019-12-13 21:40:49 -08:00

inet_fragment.c

…

inet_hashtables.c

tcp/dccp: fix possible race __inet_lookup_established()

2019-12-13 21:40:49 -08:00

inet_timewait_sock.c

…

inetpeer.c

inetpeer: fix data-race in inet_putpeer / inet_putpeer

2019-11-07 16:15:56 -08:00

ip_forward.c

ipv4: Revert removal of rt_uses_gateway

2019-09-20 18:23:33 -07:00

ip_fragment.c

…

ip_gre.c

treewide: Use sizeof_field() macro

2019-12-09 10:36:44 -08:00

ip_input.c

ipv4: use dst hint for ipv4 list receive

2019-11-21 14:45:55 -08:00

ip_options.c

…

ip_output.c

inet: protect against too small mtu values.

2019-12-07 11:55:11 -08:00

ip_sockglue.c

…

ip_tunnel_core.c

lwtunnel: check erspan options before allocating tun_info

2019-11-21 11:47:39 -08:00

ip_tunnel.c

…

ip_vti.c

treewide: Use sizeof_field() macro

2019-12-09 10:36:44 -08:00

ipcomp.c

…

ipconfig.c

net: ipconfig: Wait for deferred device probes

2019-11-20 12:39:53 -08:00

ipip.c

…

ipmr_base.c

net: fib_notifier: propagate extack down to the notifier block callback

2019-10-04 11:10:56 -07:00

ipmr.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-11-16 21:51:42 -08:00

Kconfig

net: Fix Kconfig indentation, continued

2019-11-21 12:00:21 -08:00

Makefile

…

metrics.c

…

netfilter.c

…

netlink.c

…

nexthop.c

net: remove the unnecessary strict_start_type in some policies

2019-11-21 11:46:18 -08:00

ping.c

ip: support SO_MARK cmsg

2019-09-13 21:44:19 +02:00

proc.c

…

protocol.c

…

raw_diag.c

…

raw.c

netfilter: drop bridge nf reset from nf_reset

2019-10-01 18:42:15 +02:00

route.c

ipv4: use dst hint for ipv4 list receive

2019-11-21 14:45:55 -08:00

syncookies.c

tcp: Remove one extra ktime_get_ns() from cookie_init_timestamp

2019-11-07 16:17:52 -08:00

sysctl_net_ipv4.c

net-tcp: Disable TCP ssthresh metrics cache by default

2019-12-09 20:17:48 -08:00

tcp_bbr.c

net: annotate lockless accesses to sk->sk_pacing_shift

2019-12-17 22:09:52 -08:00

tcp_bic.c

…

tcp_bpf.c

net: skmsg: fix TLS 1.3 crash with full sk_msg

2019-11-28 22:40:29 -08:00

tcp_cdg.c

…

tcp_cong.c

tcp: warn if offset reach the maxlen limit when using snprintf

2019-11-20 22:23:36 -08:00

tcp_cubic.c

…

tcp_dctcp.c

…

tcp_dctcp.h

…

tcp_diag.c

net: annotate lockless accesses to sk->sk_max_ack_backlog

2019-11-06 16:14:48 -08:00

tcp_fastopen.c

tcp: add TCP_INFO status for failed client TFO

2019-10-25 19:25:37 -07:00

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

…

tcp_input.c

tcp: add TCP_INFO status for failed client TFO

2019-10-25 19:25:37 -07:00

tcp_ipv4.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-12-22 15:15:05 -08:00

tcp_lp.c

…

tcp_metrics.c

net-tcp: Disable TCP ssthresh metrics cache by default

2019-12-09 20:17:48 -08:00

tcp_minisocks.c

tcp: annotate tp->snd_nxt lockless reads

2019-10-13 10:13:08 -07:00

tcp_nv.c

…

tcp_offload.c

…

tcp_output.c

net: annotate lockless accesses to sk->sk_pacing_shift

2019-12-17 22:09:52 -08:00

tcp_rate.c

…

tcp_recovery.c

…

tcp_scalable.c

…

tcp_timer.c

tcp: refactor tcp_retransmit_timer()

2019-12-03 11:52:38 -08:00

tcp_ulp.c

tcp: warn if offset reach the maxlen limit when using snprintf

2019-11-20 22:23:36 -08:00

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-12-22 15:15:05 -08:00

tunnel4.c

…

udp_diag.c

…

udp_impl.h

…

udp_offload.c

…

udp_tunnel.c

…

udp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-11-22 16:27:24 -08:00

udplite.c

…

xfrm4_input.c

…

xfrm4_output.c

netfilter: Support iif matches in POSTROUTING

2019-11-15 23:44:48 +01:00

xfrm4_policy.c

ipv4: Revert removal of rt_uses_gateway

2019-09-20 18:23:33 -07:00

xfrm4_protocol.c

…

xfrm4_state.c

…

xfrm4_tunnel.c

…