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

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

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

2017-04-15 21:16:30 -04:00

..

netfilter

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

2017-04-15 21:16:30 -04:00

af_inet.c

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

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

ah4.c

IPsec: do not ignore crypto err in ah4 input

2017-01-16 12:57:48 +01:00

arp.c

neighbour: fix nlmsg_pid in notifications

2017-03-22 10:48:49 -07:00

cipso_ipv4.c

netlabel: out of bound access in cipso_v4_validate()

2017-02-04 19:44:22 -05:00

datagram.c

…

devinet.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

esp4_offload.c

esp: Add a software GRO codepath

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

esp4.c

esp: Introduce a helper to setup the trailer

2017-01-17 10:23:08 +01:00

fib_frontend.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

fib_lookup.h

…

fib_notifier.c

ipv4: fib: Remove redundant argument

2017-03-10 09:45:09 -08:00

fib_rules.c

ipv4: fib_rules: Dump FIB rules when registering FIB notifier

2017-03-16 10:18:34 -07:00

fib_semantics.c

net: ipv4: add support for ECMP hash policy choice

2017-03-21 15:27:19 -07:00

fib_trie.c

ipv4: fib: Remove redundant argument

2017-03-10 09:45:09 -08:00

fou.c

…

gre_demux.c

…

gre_offload.c

…

icmp.c

net: ipv4: add support for ECMP hash policy choice

2017-03-21 15:27:19 -07:00

igmp.c

igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()

2017-02-09 16:43:45 -05:00

inet_connection_sock.c

net: Work around lockdep limitation in sockets that use sockets

2017-03-09 18:23:27 -08:00

inet_diag.c

tcp: remove early retransmit

2017-01-13 22:37:16 -05:00

inet_fragment.c

…

inet_hashtables.c

inet: kill smallest_size and smallest_port

2017-01-18 13:04:29 -05:00

inet_timewait_sock.c

ipv4: Namespaceify tcp_tw_recycle and tcp_max_tw_buckets knob

2016-12-29 11:38:31 -05:00

inetpeer.c

…

ip_forward.c

…

ip_fragment.c

inet: frag: release spinlock before calling icmp_send()

2017-03-22 15:40:45 -07:00

ip_gre.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ip_input.c

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

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

ip_options.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ip_output.c

udp: avoid ufo handling on IP payload compression packets

2017-03-09 18:28:42 -08:00

ip_sockglue.c

ip: fix IP_CHECKSUM handling

2017-02-21 12:23:53 -05:00

ip_tunnel_core.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

ip_tunnel.c

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

ip_vti.c

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

ipcomp.c

…

ipconfig.c

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

2017-04-06 08:24:51 -07:00

ipip.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ipmr.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

Kconfig

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

2017-02-16 21:25:49 -05:00

Makefile

ipv4: fib: Move FIB notification code to a separate file

2017-03-10 09:45:09 -08:00

netfilter.c

netfilter: use skb_to_full_sk in ip_route_me_harder

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

ping.c

ping: implement proper locking

2017-03-24 20:50:28 -07:00

proc.c

tcp: remove tcp_tw_recycle

2017-03-16 20:33:56 -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

…

raw.c

net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP

2017-02-07 13:07:47 -05:00

route.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

syncookies.c

syncookies: use SipHash in place of SHA1

2017-01-09 13:58:57 -05:00

sysctl_net_ipv4.c

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

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

tcp_bbr.c

…

tcp_bic.c

…

tcp_cdg.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

tcp_cong.c

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

2016-11-22 13:27:16 -05:00

tcp_cubic.c

…

tcp_dctcp.c

Revert "dctcp: update cwnd on congestion event"

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

tcp_diag.c

…

tcp_fastopen.c

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

2017-01-28 10:33:06 -05:00

tcp_highspeed.c

tcp: add cwnd_undo functions to various tcp cc algorithms

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

tcp_htcp.c

…

tcp_hybla.c

tcp: make undo_cwnd mandatory for congestion modules

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

tcp_illinois.c

tcp: add cwnd_undo functions to various tcp cc algorithms

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

tcp_input.c

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

2017-04-15 21:16:30 -04:00

tcp_ipv4.c

tcp: Record Rx hash and NAPI ID in tcp_child_process

2017-03-24 20:49:30 -07:00

tcp_lp.c

tcp: make undo_cwnd mandatory for congestion modules

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

tcp_metrics.c

tcp: remove per-destination timestamp cache

2017-03-16 20:33:56 -07:00

tcp_minisocks.c

tcp: Record Rx hash and NAPI ID in tcp_child_process

2017-03-24 20:49:30 -07:00

tcp_nv.c

…

tcp_offload.c

…

tcp_output.c

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

2017-04-15 21:16:30 -04:00

tcp_probe.c

tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"

2017-02-21 13:26:03 -05:00

tcp_rate.c

…

tcp_recovery.c

tcp: fix lost retransmit SNMP under-counting

2017-04-05 18:41:27 -07:00

tcp_scalable.c

tcp: add cwnd_undo functions to various tcp cc algorithms

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

tcp_timer.c

tcp: fix various issues for sockets morphing to listen state

2017-03-07 13:58:33 -08:00

tcp_vegas.c

tcp: make undo_cwnd mandatory for congestion modules

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

tcp_vegas.h

…

tcp_veno.c

tcp: add cwnd_undo functions to various tcp cc algorithms

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

tcp_westwood.c

tcp_westwood: fix tcp_westwood_info() style mistakes

2017-03-16 20:23:28 -07:00

tcp_yeah.c

tcp: add cwnd_undo functions to various tcp cc algorithms

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

tcp.c

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

2017-04-15 21:16:30 -04:00

tunnel4.c

…

udp_diag.c

…

udp_impl.h

udplite: call proper backlog handlers

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

udp_offload.c

…

udp_tunnel.c

…

udp.c

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

2017-02-07 16:29:30 -05: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

…

xfrm4_mode_transport.c

esp: Add a software GRO codepath

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

xfrm4_mode_tunnel.c

…

xfrm4_output.c

…

xfrm4_policy.c

xfrm: policy: make policy backend const

2017-02-09 10:22:19 +01: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

…