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

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

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

2019-06-17 20:20:36 -07:00

..

can.h

can: af_can: give struct holding the CAN per device receive lists a sensible name

2018-01-05 11:12:08 +01:00

conntrack.h

netfilter: conntrack: limit sysctl setting for boolean options

2019-04-30 14:18:56 +02:00

core.h

sock: Hide unused variable when !CONFIG_PROC_FS.

2017-12-19 09:58:14 -05:00

dccp.h

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

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

generic.h

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

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

hash.h

netns: provide pure entropy for net_hash_mix()

2019-03-28 17:00:45 -07:00

ieee802154_6lowpan.h

net: dynamically allocate fqdir structures

2019-05-26 14:08:05 -07:00

ipv4.h

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

2019-06-17 20:20:36 -07:00

ipv6.h

net: dynamically allocate fqdir structures

2019-05-26 14:08:05 -07:00

mib.h

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

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

mpls.h

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

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

netfilter.h

netfilter: don't allocate space for arp/bridge hooks unless needed

2018-01-08 18:01:11 +01:00

nexthop.h

net: Initial nexthop code

2019-05-28 21:37:30 -07:00

nftables.h

netfilter: nf_tables: use dedicated mutex to guard transactions

2018-07-18 11:26:48 +02:00

packet.h

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

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

sctp.h

sctp: add stream interleave enable members and sockopt

2017-12-11 11:23:04 -05:00

unix.h

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

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

x_tables.h

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

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

xdp.h

net: xsk: track AF_XDP sockets on a per-netns list

2019-01-25 01:50:03 +01:00

xfrm.h

xfrm: policy: store inexact policies in an rhashtable

2018-11-09 11:57:47 +01:00