David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
6lowpan	6lowpan: move shared settings to lowpan_netdev_setup	2015-10-08 14:25:34 +02:00
9p
802
8021q
appletalk
atm
ax25
batman-adv
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
bridge	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
caif
can	can: avoid using timeval for uapi	2015-10-13 17:42:34 +02:00
ceph	rbd: use writefull op for object size writes	2015-10-16 16:49:01 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	tcp/dccp: add inet_csk_reqsk_queue_drop_and_put() helper	2015-10-16 00:52:18 -07:00
decnet	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
dns_resolver
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
ethernet
hsr
ieee802154	6lowpan: move shared settings to lowpan_netdev_setup	2015-10-08 14:25:34 +02:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
ipx
irda
iucv
key
l2tp
l3mdev	net: Add netif_is_l3_slave	2015-10-07 04:27:43 -07:00
lapb
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
mac802154
mpls	dst: Pass net into dst->output	2015-10-08 04:27:03 -07:00
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
netrom
nfc
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
packet	ipv4: Pass struct net into ip_defrag and ip_check_defrag	2015-10-12 19:44:16 -07:00
phonet
rds	RDS: fix rds-ping deadlock over TCP transport	2015-10-18 22:45:55 -07:00
rfkill
rose
rxrpc
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
sctp
sunrpc	Changes for 4.3-rc5	2015-10-15 13:44:35 -07:00
switchdev	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
unix
vmw_vsock
wimax
wireless	For the current cycle, we have the following right now:	2015-10-07 04:29:18 -07:00
x25
xfrm	dst: Pass net into dst->output	2015-10-08 04:27:03 -07:00
compat.c
Kconfig
Makefile
socket.c
sysctl_net.c