David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Several conflicts here.

NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
nfp_fl_output() needed some adjustments because the code block is in
an else block now.

Parallel additions to net/pkt_cls.h and net/sch_generic.h

A bug fix in __tcp_retransmit_skb() conflicted with some of
the rbtree changes in net-next.

The tc action RCU callback fixes in 'net' had some overlap with some
of the recent tcf_block reworking.

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

2017-10-30 21:09:24 +09:00

..

netfilter

ipv4: mark expected switch fall-throughs

2017-10-18 14:10:29 +01:00

af_inet.c

ipv4: mark expected switch fall-throughs

2017-10-18 14:10:29 +01:00

ah4.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2017-06-23 14:17:31 -04:00

arp.c

ipv4: mark expected switch fall-throughs

2017-10-18 14:10:29 +01:00

cipso_ipv4.c

tcp/dccp: fix ireq->opt races

2017-10-21 01:33:19 +01:00

datagram.c

…

devinet.c

net: Add extack to validator_info structs used for address notifier

2017-10-20 13:15:07 +01:00

esp4_offload.c

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

2017-09-01 17:42:05 -07:00

esp4.c

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

2017-09-01 17:42:05 -07:00

fib_frontend.c

net: avoid a full fib lookup when rp_filter is disabled.

2017-09-21 15:15:22 -07:00

fib_lookup.h

ipv4: do metrics match when looking up and deleting a route

2017-08-23 20:37:10 -07:00

fib_notifier.c

net: Add module reference to FIB notifiers

2017-09-01 20:33:42 -07:00

fib_rules.c

net: fib_rules: Implement notification logic in core

2017-08-03 15:35:59 -07:00

fib_semantics.c

net: ipv4: remove fib_info arg to fib_check_nh

2017-09-29 06:19:32 +01:00

fib_trie.c

net: ipv4: Change fib notifiers to take a fib_alias

2017-10-20 13:29:26 +01:00

fou.c

gue: fix remcsum when GRO on and CHECKSUM_PARTIAL boundary is outer UDP

2017-08-01 16:09:14 -07:00

gre_demux.c

…

gre_offload.c

gso: fix payload length when gso_size is zero

2017-10-08 10:12:15 -07:00

icmp.c

ipv4: icmp: use BUG_ON instead of if condition followed by BUG

2017-10-24 18:44:42 +09:00

igmp.c

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

2017-08-21 17:06:42 -07:00

inet_connection_sock.c

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

2017-10-30 21:09:24 +09:00

inet_diag.c

inet_diag: allow protocols to provide additional data

2017-09-01 18:38:09 -07:00

inet_fragment.c

inet: frags: Convert timers to use timer_setup()

2017-10-18 12:39:55 +01:00

inet_hashtables.c

soreuseport: fix initialization race

2017-10-22 02:03:51 +01:00

inet_timewait_sock.c

ipv4: timewait: Convert timers to use timer_setup()

2017-10-18 12:40:27 +01:00

inetpeer.c

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

2017-10-05 18:19:22 -07:00

ip_forward.c

ipv4: allow local fragmentation in ip_finish_output_gso()

2016-11-03 16:10:26 -04:00

ip_fragment.c

inet: frags: Convert timers to use timer_setup()

2017-10-18 12:39:55 +01:00

ip_gre.c

ip_gre: check packet length and mtu correctly in erspan tx

2017-10-07 23:17:21 +01:00

ip_input.c

IPv4: early demux can return an error code

2017-10-01 03:55:47 +01:00

ip_options.c

ip/options: explicitly provide net ns to __ip_options_echo()

2017-08-06 20:51:12 -07:00

ip_output.c

udp: remove unreachable ufo branches

2017-08-22 14:27:18 -07:00

ip_sockglue.c

net: ipv4: fix l3slave check for index returned in IP_PKTINFO

2017-09-15 14:27:51 -07:00

ip_tunnel_core.c

net: store port/representator id in metadata_dst

2017-06-25 11:42:01 -04:00

ip_tunnel.c

ipv4: speedup ipv6 tunnels dismantle

2017-09-19 16:32:24 -07:00

ip_vti.c

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

2017-10-05 18:19:22 -07:00

ipcomp.c

…

ipconfig.c

networking: convert many more places to skb_put_zero()

2017-06-16 11:48:35 -04:00

ipip.c

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

2017-10-30 21:09:24 +09:00

ipmr.c

ipv4: mark expected switch fall-throughs

2017-10-18 14:10:29 +01:00

Kconfig

ip: update policy routing config help

2017-10-12 22:57:11 -07:00

Makefile

tcp: ULP infrastructure

2017-06-15 12:12:40 -04:00

netfilter.c

netfilter: use skb_to_full_sk in ip_route_me_harder

2017-02-28 12:49:36 +01:00

ping.c

net: convert sock.sk_refcnt from atomic_t to refcount_t

2017-07-01 07:39:08 -07:00

proc.c

tcp: Revert "tcp: remove header prediction"

2017-08-30 11:20:09 -07:00

protocol.c

net: Add sysctl to toggle early demux for tcp and udp

2017-03-24 13:17:07 -07:00

raw_diag.c

net: ipv6: add second dif to raw socket lookups

2017-08-07 11:39:22 -07:00

raw.c

net: ipv4: add second dif to multicast source filter

2017-08-07 11:39:22 -07:00

route.c

ipv4: ipv4_default_advmss() should use route mtu

2017-10-21 01:55:05 +01:00

syncookies.c

tcp: Namespace-ify sysctl_tcp_workaround_signed_windows

2017-10-28 19:24:38 +09:00

sysctl_net_ipv4.c

tcp: Namespace-ify sysctl_tcp_pacing_ca_ratio

2017-10-28 19:24:39 +09:00

tcp_bbr.c

tcp_bbr: init pacing rate on first RTT sample

2017-07-15 14:43:29 -07:00

tcp_bic.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_cdg.c

tcp: cdg: make struct tcp_cdg static

2017-10-16 21:24:25 +01:00

tcp_cong.c

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

2017-09-01 17:42:05 -07:00

tcp_cubic.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_dctcp.c

Revert "dctcp: update cwnd on congestion event"

2016-12-06 11:34:24 -05:00

tcp_diag.c

tcp_diag: report TCP MD5 signing keys and addresses

2017-09-01 18:38:09 -07:00

tcp_fastopen.c

tcp: Configure TFO without cookie per socket and/or per route

2017-10-24 18:48:08 +09:00

tcp_highspeed.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_htcp.c

tcp: fix cwnd undo in Reno and HTCP congestion controls

2017-08-06 21:25:10 -07:00

tcp_hybla.c

tcp: make undo_cwnd mandatory for congestion modules

2016-11-21 13:20:17 -05:00

tcp_illinois.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_input.c

tcp: Remove "linux/unaligned/access_ok.h" include.

2017-10-29 11:14:08 +09:00

tcp_ipv4.c

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

2017-10-30 21:09:24 +09:00

tcp_lp.c

tcp: switch TCP TS option (RFC 7323) to 1ms clock

2017-05-17 16:06:01 -04:00

tcp_metrics.c

tcp: Namespace-ify sysctl_tcp_nometrics_save

2017-10-28 19:24:38 +09:00

tcp_minisocks.c

tcp: Namespace-ify sysctl_tcp_workaround_signed_windows

2017-10-28 19:24:38 +09:00

tcp_nv.c

bpf: Add BPF_SOCKET_OPS_BASE_RTT support to tcp_nv

2017-10-22 03:12:05 +01:00

tcp_offload.c

net: convert sock.sk_wmem_alloc from atomic_t to refcount_t

2017-07-01 07:39:08 -07:00

tcp_output.c

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

2017-10-30 21:09:24 +09:00

tcp_probe.c

tcp: remove redundant argument from tcp_rcv_established()

2017-07-24 17:28:12 -07:00

tcp_rate.c

tcp: export do_tcp_sendpages and tcp_rate_check_app_limited functions

2017-06-15 12:12:40 -04:00

tcp_recovery.c

tcp: Namespace-ify sysctl_tcp_recovery

2017-10-27 16:35:42 +09:00

tcp_scalable.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_timer.c

tcp: Namespace-ify sysctl_tcp_thin_linear_timeouts

2017-10-27 16:35:42 +09:00

tcp_ulp.c

tcp: ulp: avoid module refcnt leak in tcp_set_ulp

2017-08-14 22:17:05 -07:00

tcp_vegas.c

tcp: fix under-evaluated ssthresh in TCP Vegas

2017-09-29 06:07:00 +01:00

tcp_vegas.h

…

tcp_veno.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp_westwood.c

tcp: Revert "tcp: remove CA_ACK_SLOWPATH"

2017-08-30 11:20:08 -07:00

tcp_yeah.c

tcp: consolidate congestion control undo functions

2017-08-06 21:25:10 -07:00

tcp.c

tcp: Namespace-ify sysctl_tcp_autocorking

2017-10-28 19:24:39 +09:00

tunnel4.c

tunnels: correct conditional build of MPLS and IPv6

2016-07-11 13:27:06 -07:00

udp_diag.c

net: ipv6: add second dif to udp socket lookups

2017-08-07 11:39:22 -07:00

udp_impl.h

udp: make *udp*_queue_rcv_skb() functions static

2017-05-18 10:23:33 -04:00

udp_offload.c

gso: fix payload length when gso_size is zero

2017-10-08 10:12:15 -07:00

udp_tunnel.c

net: add infrastructure to un-offload UDP tunnel port

2017-07-24 13:52:59 -07:00

udp.c

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

2017-10-22 13:39:14 +01:00

udplite.c

udplite: call proper backlog handlers

2016-11-24 15:32:14 -05:00

xfrm4_input.c

esp: Add a software GRO codepath

2017-02-15 11:04:11 +01:00

xfrm4_mode_beet.c

networking: make skb_pull & friends return void pointers

2017-06-16 11:48:39 -04:00

xfrm4_mode_transport.c

xfrm: Add encapsulation header offsets while SKB is not encrypted

2017-04-14 10:07:39 +02:00

xfrm4_mode_tunnel.c

xfrm: Add encapsulation header offsets while SKB is not encrypted

2017-04-14 10:07:39 +02:00

xfrm4_output.c

xfrm: Add an IPsec hardware offloading API

2017-04-14 10:06:10 +02:00

xfrm4_policy.c

net: xfrm: support setting an output mark.

2017-08-11 07:03:00 +02:00

xfrm4_protocol.c

xfrm: input: constify xfrm_input_afinfo

2017-02-09 10:22:17 +01:00

xfrm4_state.c

xfrm: remove unused function

2017-01-10 10:57:12 +01:00

xfrm4_tunnel.c

…