David S. Miller fba961ab29 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes. Also on the net-next side the XDP state management is handled more in the generic layers so undo the 'net' nfp fix which isn't applicable in net-next. Include a necessary change by Jakub Kicinski, with log message: ==================== cls_bpf no longer takes care of offload tracking. Make sure netdevsim performs necessary checks. This fixes a warning caused by TC trying to remove a filter it has not added. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-22 11:16:31 -05:00
..
6lowpan
9p	make sock_alloc_file() do sock_release() on failures	2017-12-05 18:39:29 -05:00
802
8021q
appletalk
atm	atm: mpoa: remove 32-bit timekeeping	2017-11-30 09:26:32 -05:00
ax25
batman-adv	batman-adv: Convert packet.h to uapi header	2017-12-21 15:35:53 -05:00
bluetooth	Bluetooth: introduce DEFINE_SHOW_ATTRIBUTE() macro	2017-12-13 20:20:34 +01:00
bpf
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
caif
can	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
ceph
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
dcb
dccp	net: tracepoint: using sock_set_state tracepoint to trace DCCP state transition	2017-12-20 14:00:25 -05:00
decnet	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
dns_resolver
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
ethernet
hsr
ieee802154
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
ipx
iucv
kcm	make sock_alloc_file() do sock_release() on failures	2017-12-05 18:39:29 -05:00
key
l2tp
l3mdev
lapb
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
mac802154
mpls	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
ncsi	net/ncsi: Don't take any action on HNCDSC AEN	2017-12-18 14:50:11 -05:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
netrom
nfc
nsh
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
packet
phonet	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
psample
qrtr	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-09 22:09:55 -05:00
rfkill
rose
rxrpc	rxrpc: Use correct netns source in rxrpc_release_sock()	2017-12-03 10:05:20 -05:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
smc	smc: support variable CLC proposal messages	2017-12-07 15:03:12 -05:00
strparser
sunrpc	NFS client fixes for Linux 4.15-rc4	2017-12-16 13:12:53 -08:00
switchdev
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
tls
unix
vmw_vsock	VSOCK: fix outdated sk_state value in hvs_release()	2017-12-05 15:07:37 -05:00
wimax
wireless	cfg80211: ship certificates as hex files	2017-12-19 09:28:01 +01:00
x25
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-12-15 11:10:27 -05:00
compat.c
Kconfig
Makefile
socket.c	sock: Move the socket inuse to namespace.	2017-12-19 09:58:14 -05:00
sysctl_net.c