David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
6lowpan	…
9p	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
802	…
8021q	vlan: implement ndo_get_iflink	2015-04-02 14:05:00 -04:00
appletalk	…
atm	…
ax25	…
batman-adv	dev: introduce dev_get_iflink()	2015-04-02 14:04:59 -04:00
bluetooth	Bluetooth: Unify advertising data code paths	2015-03-26 03:30:29 +01:00
bridge	dev: introduce dev_get_iflink()	2015-04-02 14:04:59 -04:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
can	can: introduce new raw socket option to join the given CAN filters	2015-04-01 11:28:22 +02:00
ceph	…
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
dcb	…
dccp	inet: fix double request socket freeing	2015-03-23 21:40:48 -04:00
decnet	…
dns_resolver	…
dsa	dsa: implement ndo_get_iflink	2015-04-02 14:05:01 -04:00
ethernet	…
hsr	…
ieee802154	ieee802154: don't export static symbol	2015-03-14 17:11:31 +01:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
ipx	…
irda	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-09 23:38:02 -04:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
key	xfrm: simplify xfrm_address_t use	2015-03-31 13:58:35 -04:00
l2tp	netlink: implement nla_get_in_addr and nla_get_in6_addr	2015-03-31 13:58:35 -04:00
lapb	…
llc	…
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
mac802154	mac802154: cleanup concurrent check	2015-03-27 19:18:50 +01:00
mpls	mpls: In mpls_egress verify the packet length.	2015-03-12 23:05:04 -04:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-03-29 12:43:43 -07:00
netlabel	netlink: implement nla_put_in_addr and nla_put_in6_addr	2015-03-31 13:58:35 -04:00
netlink	rhashtable: provide len to obj_hashfn	2015-03-25 17:18:33 +01:00
netrom	…
nfc	…
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
packet	af_packet: pass checksum validation status to the user	2015-03-23 22:01:28 -04:00
phonet	…
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
rfkill	…
rose	…
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
sched	pkt_sched: fq: correct spelling of locally	2015-04-01 22:52:29 -04:00
sctp	sctp: avoid to repeatedly declare external variables	2015-03-25 11:40:16 -04:00
sunrpc	sunrpc: make debugfs file creation failure non-fatal	2015-03-31 14:15:08 -04:00
switchdev	switchdev: fix stp update API to work with layered netdevices	2015-03-23 16:44:56 -04:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
unix	…
vmw_vsock	…
wimax	…
wireless	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
x25	…
xfrm	xfrm: simplify xfrm_address_t use	2015-03-31 13:58:35 -04:00
Kconfig	…
Makefile	…
compat.c	net: socket: add support for async operations	2015-03-23 16:41:36 -04:00
socket.c	net: socket: add support for async operations	2015-03-23 16:41:36 -04:00
sysctl_net.c	…