David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
6lowpan	6lowpan: Off by one handling ->nexthdr	2019-04-23 19:09:58 +02:00
9p	9p/net: fix memory leak in p9_client_create	2019-03-13 11:50:04 +01:00
802
8021q	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
appletalk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
atm	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
ax25	net: ax25: fix misuse of %x	2019-04-21 10:37:26 -07:00
batman-adv	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
bluetooth	Bluetooth: Align minimum encryption key size for LE and BR/EDR connections	2019-04-25 06:18:07 -07:00
bpf	bpf: Introduce bpf sk local storage	2019-04-27 09:07:04 -07:00
bpfilter	bpfilter: re-add header search paths to tools include to fix build error	2019-02-23 13:34:40 -08:00
bridge	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
caif	net: caif: avoid using qdisc_qlen()	2019-04-10 12:20:46 -07:00
can	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
ceph	libceph: fix breakage caused by multipage bvecs	2019-03-25 22:28:07 +01:00
core	devlink: Change devlink health locking mechanism	2019-05-01 11:07:03 -04:00
dcb	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
dccp	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
decnet	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
dns_resolver	dns: remove redundant zero length namelen check	2019-04-11 14:01:08 -07:00
dsa	net: dsa: Remove legacy probing support	2019-04-30 23:15:35 -04:00
ethernet	net: pass net_device argument to the eth_get_headlen	2019-04-23 18:36:34 +02:00
hsr	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
ieee802154	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
iucv	iucv: Remove SKB list assumptions.	2018-11-10 16:55:11 -08:00
kcm	kcm: switch order of device registration to fix a crash	2019-04-01 14:59:20 -07:00
key	xfrm: clean up xfrm protocol checks	2019-03-26 08:35:36 +01:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
l3mdev	l3mdev: add function to retreive upper master	2018-12-03 14:15:26 -08:00
lapb
llc	llc: Check address length before reading address field	2019-04-12 10:25:03 -07:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
mac802154	mac802154: Remove VLA usage of skcipher	2018-09-28 12:46:07 +08:00
mpls	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
ncsi	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
netfilter	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
netlabel	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
netrom	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
nfc	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
nsh	nsh: set mac len based on inner packet	2018-07-12 16:55:29 -07:00
openvswitch	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
phonet	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
psample	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
qrtr	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00
rds	rds: ib: force endiannes annotation	2019-05-01 17:15:36 -04:00
rfkill	rfkill: gpio: Remove unused include	2018-12-18 13:13:56 +01:00
rose	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-25 23:52:29 -04:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
sched	taprio: Add support for cycle-time-extension	2019-05-01 11:58:51 -04:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
smc	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
strparser	net: strparser: make it explicitly non-modular	2019-04-22 21:50:54 -07:00
sunrpc	Fix miscellaneous nfsd bugs, in NFSv4.1 callbacks, NFSv4.1	2019-04-23 13:40:55 -07:00
switchdev	switchdev: Remove unused transaction item queue	2019-03-01 21:35:19 -08:00
tipc	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
tls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
unix	datagram: remove rendundant 'peeked' argument	2019-04-08 09:51:54 -07:00
vmw_vsock	vsock/virtio: fix kernel panic from virtio_transport_reset_no_sock	2019-03-08 15:15:44 -08:00
wimax	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
x25	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
xdp	xsk: fix XDP socket ring buffer memory ordering	2019-04-16 20:13:10 -07:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
compat.c	net: rework SIOCGSTAMP ioctl handling	2019-04-19 14:07:40 -07:00
Kconfig	net: devlink: select NET_DEVLINK from drivers	2019-03-24 14:55:31 -04:00
Makefile	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
socket.c	net: socket: Fix missing break in switch statement	2019-04-26 11:28:47 -04:00
sysctl_net.c