David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
6lowpan
9p
802
8021q	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
appletalk
atm	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
ax25	ax25: remove blank line at EOF	2018-07-24 14:10:42 -07:00
batman-adv	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
bluetooth
bpf
bpfilter	bpfilter: remove trailing newline	2018-07-24 14:10:42 -07:00
bridge	net: bridge: add support for backup port	2018-07-23 09:32:15 -07:00
caif	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
can
ceph
core	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
dcb	net: dcb: Add priority-to-DSCP map getters	2018-07-27 13:17:50 -07:00
dccp	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
decnet	decnet: whitespace fixes	2018-07-24 14:10:42 -07:00
dns_resolver	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
dsa	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
ethernet
hsr
ieee802154	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
ife
ipv4	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
ipv6	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
iucv	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
kcm	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
key	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2018-07-27 09:33:37 -07:00
l2tp	l2tp: drop ->mru from struct l2tp_session	2018-07-27 13:34:53 -07:00
l3mdev
lapb
llc	llc: fix whitespace issues	2018-07-24 14:10:42 -07:00
mac80211	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
mac802154
mpls	mpls: remove trailing whitepace	2018-07-24 14:10:42 -07:00
ncsi
netfilter	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
netlabel
netlink	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
netrom
nfc	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
nsh
openvswitch	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
packet	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
phonet
psample
qrtr
rds	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
rfkill
rose
rxrpc	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
sched	net: sched: make tcf_chain_{get,put}() static	2018-08-01 10:06:19 -07:00
sctp	sctp: whitespace fixes	2018-07-24 14:10:42 -07:00
smc	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
strparser	strparser: remove redundant variable 'rd_desc'	2018-08-01 10:00:06 -07:00
sunrpc
switchdev
tipc	net/tipc: remove redundant variables 'tn' and 'oport'	2018-08-01 09:46:49 -07:00
tls	net/tls: Use kmemdup to simplify the code	2018-08-01 09:47:47 -07:00
unix	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
vmw_vsock
wimax	wimax: remove blank lines at EOF	2018-07-24 14:10:42 -07:00
wireless	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
x25	x25: remove blank lines at EOF	2018-07-24 14:10:42 -07:00
xdp	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
xfrm	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
compat.c
Kconfig	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
Makefile
socket.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
sysctl_net.c