David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07:00
..
6lowpan
9p	net/9p/client.c: put refcount of trans_mod in error case in parse_opts()	2018-07-14 11:11:09 -07:00
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	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -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	tcp: remove unneeded variable 'err'	2018-08-03 16:52:07 -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	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -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	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -07:00
netlabel
netlink	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -07:00
netrom
nfc	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
nsh	nsh: set mac len based on inner packet	2018-07-12 16:55:29 -07:00
openvswitch	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
packet	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -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	rxrpc: Push iov_iter up from rxrpc_kernel_recv_data() to caller	2018-08-03 12:46:20 -07:00
sched	net: sched: fix flush on non-existing chain	2018-08-03 09:44:37 -07:00
sctp	sctp: whitespace fixes	2018-07-24 14:10:42 -07:00
smc	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -07:00
strparser	strparser: remove redundant variable 'rd_desc'	2018-08-01 10:00:06 -07:00
sunrpc	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -07:00
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	af_unix: ensure POLLOUT on remote close() for connected dgram socket	2018-08-03 16:44:19 -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-05 13:04:31 -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