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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-07-04 19:36:06 -07:00
vlan: Add GRO support for non hardware accelerated vlan
2015-06-01 16:50:52 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
NET: AX.25: Stop heartbeat timer on disconnect.
2015-07-15 15:59:58 -07:00
batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
2015-06-07 17:07:20 +02:00
Bluetooth: Fix NULL pointer dereference in smp_conn_security
2015-07-23 16:41:24 +02:00
bridge: netlink: fix slave_changelink/br_setport race conditions
2015-07-26 16:27:22 -07:00
caif: fix leaks and race in caif_queue_rcv_skb()
2015-07-21 00:02:44 -07:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: treat sockaddr_storage with uninitialized family as blank
2015-07-09 20:30:34 +03:00
cgroup: net_cls: fix false-positive "suspicious RCU usage"
2015-07-25 00:13:18 -07:00
sock_diag: specify info_size per inet protocol
2015-06-15 19:49:22 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
net: dsa: Fix off-by-one in switch address parsing
2015-07-11 23:25:16 -07:00
net: Add full IPv6 addresses to flow_keys
2015-06-04 15:44:30 -07:00
inet: frag: change *_frag_mem_limit functions to take netns_frags as argument
2015-07-26 21:00:14 -07:00
inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test
2015-07-26 21:00:15 -07:00
inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test
2015-07-26 21:00:15 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
irda: use msecs_to_jiffies for conversion to jiffies
2015-05-25 17:46:21 -04:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
net: Modify sk_alloc to not reference count the netns of kernel sockets.
2015-05-11 10:50:18 -04:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
cfg80211: use RTNL locked reg_can_beacon for IR-relaxation
2015-07-17 15:02:02 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-13 23:56:52 -07:00
netfilter: nf_conntrack: Support expectations in different zones
2015-07-22 17:00:47 +02:00
netlink: don't hold mutex in rcu callback when releasing mmapd ring
2015-07-21 22:22:56 -07:00
netfilter: Remove spurios included of netfilter.h
2015-06-18 21:14:32 +02:00
NFC: nci: fix mistake in uart generic driver
2015-06-15 18:10:37 +02:00
openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodes
2015-07-21 22:26:03 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-24 02:58:51 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
Changes for 4.2-rc
2015-07-15 17:03:03 -07:00
net: rfkill: gpio: make better use of gpiod API
2015-05-29 13:13:45 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-24 02:58:51 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
sch_choke: drop all packets in queue during reset
2015-07-24 22:57:15 -07:00
net: sctp: stop spamming klog with rfc6458, 5.3.2. deprecation warnings
2015-07-26 16:32:41 -07:00
NFS client updates for Linux 4.2
2015-07-02 11:32:23 -07:00
net: switchdev: don't abort unsupported operations
2015-07-11 21:29:55 -07:00
net/tipc: initialize security state for new connection socket
2015-07-08 16:08:23 -07:00
net/unix: support SCM_SECURITY for stream sockets
2015-06-10 22:49:20 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
cfg80211: use RTNL locked reg_can_beacon for IR-relaxation
2015-07-17 15:02:02 +02:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
net: add CONFIG_NET_INGRESS to enable ingress filtering
2015-05-14 01:10:05 -04:00
net: Add a struct net parameter to sock_create_kern
2015-05-11 10:50:17 -04:00
03de104f7b