You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		10 years ago
..
6lowpan	…
9p	9p: patches for 4.1 merge window	10 years ago
802	net: Kill dev_rebuild_header	10 years ago
8021q	vlan: implement ndo_get_iflink	10 years ago
appletalk	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
atm	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
ax25	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
batman-adv	dev: introduce dev_get_iflink()	10 years ago
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
bridge	switchdev: don't use anonymous union on switchdev attr/obj structs	10 years ago
caif	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
can	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
ceph	net: Add a struct net parameter to sock_create_kern	10 years ago
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
dcb	net/dcb: Add IEEE QCN attribute	10 years ago
dccp	inet: fix possible panic in reqsk_queue_unlink()	10 years ago
decnet	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
dns_resolver	…
dsa	switchdev: don't use anonymous union on switchdev attr/obj structs	10 years ago
ethernet	etherdev: Fix sparse error, make test usable by other functions	10 years ago
hsr	net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.	10 years ago
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
ipv4	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	10 years ago
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
ipx	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
irda	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
iucv	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
key	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
l2tp	net: Modify sk_alloc to not reference count the netns of kernel sockets.	10 years ago
lapb	…
llc	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
mac802154	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	10 years ago
mpls	mpls: Change reserved label names to be consistent with netbsd	10 years ago
netfilter	net: Modify sk_alloc to not reference count the netns of kernel sockets.	10 years ago
netlabel	netlink: implement nla_put_in_addr and nla_put_in6_addr	10 years ago
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
netrom	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
nfc	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
openvswitch	openvswitch: Use eth_proto_is_802_3	10 years ago
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
phonet	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
rfkill	…
rose	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
rxrpc	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
sctp	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
sunrpc	svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures	10 years ago
switchdev	switchdev: don't use anonymous union on switchdev attr/obj structs	10 years ago
tipc	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
unix	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
vmw_vsock	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
wimax	…
wireless	cfg80211: change GO_CONCURRENT to IR_CONCURRENT for STA	10 years ago
x25	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
xfrm	net: make skb_dst_pop routine static	10 years ago
Kconfig	…
Makefile	mpls: Refactor how the mpls module is built	10 years ago
compat.c	net: switch importing msghdr from userland to {compat_,}import_iovec()	10 years ago
socket.c	net: Add a struct net parameter to sock_create_kern	10 years ago
sysctl_net.c	…