David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
6lowpan	6lowpan: fix debugfs interface entry name	2015-12-20 08:21:00 +01:00
9p	Rework and error handling fixes, primarily in the fscatch and fd transports.	2016-01-24 12:39:09 -08:00
802
8021q	vlan: turn on unicast filtering on vlan device	2016-02-21 21:54:05 -05:00
appletalk	appletalk: fix erroneous return value	2016-02-18 14:59:34 -05:00
atm	net: Generalise wq_has_sleeper helper	2015-11-30 14:47:33 -05:00
ax25	net: add validation for the socket syscall protocol argument	2015-12-14 16:09:30 -05:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
bluetooth	Bluetooth: hci_core: Avoid mixing up req_complete and req_complete_skb	2016-02-20 08:52:28 +01:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
caif	net: caif: fix erroneous return value	2016-02-18 14:59:35 -05:00
can	can: avoid using timeval for uapi	2015-10-13 17:42:34 +02:00
ceph	libceph: MOSDOpReply v7 encoding	2016-02-04 18:26:08 +01:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
decnet	net: add validation for the socket syscall protocol argument	2015-12-14 16:09:30 -05:00
dns_resolver	net: dns_resolver: convert time_t to time64_t	2015-11-18 16:27:46 -05:00
dsa	net: dsa: Unregister slave_dev in error path	2016-02-17 22:05:16 -05:00
ethernet	net: Add eth_platform_get_mac_address() helper.	2016-01-06 16:31:56 -05:00
hsr	net/hsr: fix a warning message	2015-11-23 14:56:15 -05:00
ieee802154	sock: struct proto hash function may error	2016-02-11 03:54:14 -05:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ipx
irda	irda: fix a potential use-after-free in ircomm_param_request	2016-01-29 22:56:46 -08:00
iucv	af_iucv: Validate socket address length in iucv_sock_bind()	2016-01-19 14:21:08 -05:00
key	af_key: fix two typos	2015-10-23 03:05:19 -07:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
l3mdev	net: Add netif_is_l3_slave	2015-10-07 04:27:43 -07:00
lapb
llc	af_llc: fix types on llc_ui_wait_for_conn	2016-02-17 16:12:13 -05:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-01 15:56:08 -08:00
mac802154	mac802154: constify ieee802154_llsec_ops structure	2016-01-04 20:40:41 +01:00
mpls	mpls: autoload lwt module	2016-02-21 22:00:28 -05:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
netlabel
netlink	nfnetlink: Revert "nfnetlink: add support for memory mapped netlink"	2016-02-18 11:42:22 -05:00
netrom
nfc	NFC 4.5 pull request	2016-01-04 21:48:15 -05:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
packet	packet: tpacket_snd gso and checksum offload	2016-02-09 06:43:50 -05:00
phonet	sock: struct proto hash function may error	2016-02-11 03:54:14 -05:00
rds	rds: duplicate include net/tcp.h	2016-02-11 09:45:24 -05:00
rfkill	rfkill: fix rfkill_fop_read wait_event usage	2016-01-26 11:32:05 +01:00
rose
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-01-12 18:57:02 -08:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
sunrpc	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
switchdev	switchdev: Require RTNL mutex to be held when sending FDB notifications	2016-01-28 16:21:31 -08:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
vmw_vsock	vsock: Fix blocking ops call in prepare_to_wait	2016-02-13 05:57:39 -05:00
wimax	net:wimax: Fix doucble word "the the" in networking.xml	2015-08-09 22:43:52 -07:00
wireless	regulatory: fix world regulatory domain data	2016-01-14 11:10:13 +01:00
x25
xfrm	net: preserve IP control block during GSO segmentation	2016-01-15 14:35:24 -05:00
compat.c
Kconfig	net: add dst_cache support	2016-02-16 20:21:48 -05:00
Makefile	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
socket.c	kmemcg: account certain kmem allocations to memcg	2016-01-14 16:00:49 -08:00
sysctl_net.c	net: sysctl: fix a kmemleak warning	2015-10-23 06:22:08 -07:00