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

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

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

2017-11-10 10:00:18 +09:00

..

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2017-11-08 14:22:50 +09: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

ipv4: fix validate_source for VRF setup

2017-11-01 21:25:15 +09:00

fib_lookup.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fib_notifier.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fib_rules.c

net: fib_rules: Implement notification logic in core

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

fib_semantics.c

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

2017-11-04 09:26:51 +09:00

fib_trie.c

net: Add extack to fib_notifier_info

2017-11-01 11:50:43 +09: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ip_fragment.c

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

2017-11-04 09:26:51 +09: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ip_output.c

udp: remove unreachable ufo branches

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

ip_sockglue.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01: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

ip_vti: remove the useless err_count check in vti_xmit

2017-11-01 11:57:32 +09:00

ipcomp.c

…

ipconfig.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

netfilter.c

…

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

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

2017-11-04 09:26:51 +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

…

tcp_diag.c

tcp_diag: report TCP MD5 signing keys and addresses

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

tcp_fastopen.c

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

2017-11-04 09:26:51 +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_illinois.c

tcp: consolidate congestion control undo functions

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

tcp_input.c

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

2017-11-10 10:00:18 +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

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

2017-11-04 09:26:51 +09:00

tcp_minisocks.c

tcp: higher throughput under reordering with adaptive RACK reordering wnd

2017-11-05 23:15:42 +09:00

tcp_nv.c

tcp_nv: use do_div() instead of expensive div64_u64()

2017-11-04 22:34:52 +09: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

tcp: do not clear again skb->csum in tcp_init_nondata_skb()

2017-11-05 22:14:54 +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: higher throughput under reordering with adaptive RACK reordering wnd

2017-11-05 23:15:42 +09:00

tcp_scalable.c

tcp: consolidate congestion control undo functions

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

tcp_timer.c

tcp: tcp_mtu_probing() cleanup

2017-11-05 22:14:23 +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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

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: higher throughput under reordering with adaptive RACK reordering wnd

2017-11-05 23:15:42 +09:00

tunnel4.c

…

udp_diag.c

net: ipv6: add second dif to udp socket lookups

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

udp_impl.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01: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

…

xfrm4_input.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

xfrm4_protocol.c

…

xfrm4_state.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

xfrm4_tunnel.c

…