David S. Miller 03de104f7b Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth ... Johan Hedberg says: ==================== pull request: bluetooth 2015-07-23 Here's another one-patch pull request for 4.2 which targets a potential NULL pointer dereference in the LE Security Manager code that can be triggered by using older user space tools. The issue has been there since 4.0 so there's the appropriate "Cc: stable" in place. Let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-26 21:53:08 -07:00
..
6lowpan	6lowpan: nhc: add other known rfc6282 compressions	2015-02-14 23:08:44 +01:00
9p	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
802	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
8021q	vlan: Add GRO support for non hardware accelerated vlan	2015-06-01 16:50:52 -07:00
appletalk	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
atm	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
ax25	NET: AX.25: Stop heartbeat timer on disconnect.	2015-07-15 15:59:58 -07:00
batman-adv	batman-adv: change the MAC of each VLAN upon ndo_set_mac_address	2015-06-07 17:07:20 +02:00
bluetooth	Bluetooth: Fix NULL pointer dereference in smp_conn_security	2015-07-23 16:41:24 +02:00
bridge	bridge: netlink: fix slave_changelink/br_setport race conditions	2015-07-26 16:27:22 -07:00
caif	caif: fix leaks and race in caif_queue_rcv_skb()	2015-07-21 00:02:44 -07:00
can	can: replace timestamp as unique skb attribute	2015-07-12 21:13:22 +02:00
ceph	libceph: treat sockaddr_storage with uninitialized family as blank	2015-07-09 20:30:34 +03:00
core	cgroup: net_cls: fix false-positive "suspicious RCU usage"	2015-07-25 00:13:18 -07:00
dcb	net/dcb: Add IEEE QCN attribute	2015-03-06 21:50:02 -05:00
dccp	sock_diag: specify info_size per inet protocol	2015-06-15 19:49:22 -07:00
decnet	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
dns_resolver
dsa	net: dsa: Fix off-by-one in switch address parsing	2015-07-11 23:25:16 -07:00
ethernet	net: Add full IPv6 addresses to flow_keys	2015-06-04 15:44:30 -07:00
hsr	net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.	2015-03-01 13:40:23 -05:00
ieee802154	inet: frag: change *_frag_mem_limit functions to take netns_frags as argument	2015-07-26 21:00:14 -07:00
ipv4	inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test	2015-07-26 21:00:15 -07:00
ipv6	inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test	2015-07-26 21:00:15 -07:00
ipx	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
irda	irda: use msecs_to_jiffies for conversion to jiffies	2015-05-25 17:46:21 -04:00
iucv	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-06-24 16:49:49 -07:00
l2tp	net: Modify sk_alloc to not reference count the netns of kernel sockets.	2015-05-11 10:50:18 -04:00
lapb
llc	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
mac80211	cfg80211: use RTNL locked reg_can_beacon for IR-relaxation	2015-07-17 15:02:02 +02:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-06-24 16:49:49 -07:00
mpls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-13 23:56:52 -07:00
netfilter	netfilter: nf_conntrack: Support expectations in different zones	2015-07-22 17:00:47 +02:00
netlabel	netlink: implement nla_put_in_addr and nla_put_in6_addr	2015-03-31 13:58:35 -04:00
netlink	netlink: don't hold mutex in rcu callback when releasing mmapd ring	2015-07-21 22:22:56 -07:00
netrom	netfilter: Remove spurios included of netfilter.h	2015-06-18 21:14:32 +02:00
nfc	NFC: nci: fix mistake in uart generic driver	2015-06-15 18:10:37 +02:00
openvswitch	openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodes	2015-07-21 22:26:03 -07:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-24 02:58:51 -07:00
phonet	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
rds	Changes for 4.2-rc	2015-07-15 17:03:03 -07:00
rfkill	net: rfkill: gpio: make better use of gpiod API	2015-05-29 13:13:45 +02:00
rose	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-24 02:58:51 -07:00
rxrpc	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
sched	sch_choke: drop all packets in queue during reset	2015-07-24 22:57:15 -07:00
sctp	net: sctp: stop spamming klog with rfc6458, 5.3.2. deprecation warnings	2015-07-26 16:32:41 -07:00
sunrpc	NFS client updates for Linux 4.2	2015-07-02 11:32:23 -07:00
switchdev	net: switchdev: don't abort unsupported operations	2015-07-11 21:29:55 -07:00
tipc	net/tipc: initialize security state for new connection socket	2015-07-08 16:08:23 -07:00
unix	net/unix: support SCM_SECURITY for stream sockets	2015-06-10 22:49:20 -07:00
vmw_vsock	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
wimax
wireless	cfg80211: use RTNL locked reg_can_beacon for IR-relaxation	2015-07-17 15:02:02 +02:00
x25	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-06-24 16:49:49 -07:00
compat.c	net: switch importing msghdr from userland to {compat_,}import_iovec()	2015-04-09 00:02:26 -04:00
Kconfig	net: add CONFIG_NET_INGRESS to enable ingress filtering	2015-05-14 01:10:05 -04:00
Makefile	mpls: Refactor how the mpls module is built	2015-03-04 00:26:06 -05:00
socket.c	net: Add a struct net parameter to sock_create_kern	2015-05-11 10:50:17 -04:00
sysctl_net.c