Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Dec 2016 19:33:17 +0000 (14:33 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Dec 2016 19:33:17 +0000 (14:33 -0500)
commit107bc0aa95ca572df42da43c30a2079266e992e4
treec3f74ba0a5f6390ddca93f5b8ed51c1400c3a145
parentea1e76f78a30c7055afd9e94f785743eeda71c52
parenta62da6f14db79bd7ea435ab095e998b31b3dbb22
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2016-12-08

I didn't miss your "net-next is closed" email, but it did come as a bit
of a surprise, and due to time-zone differences I didn't have a chance
to react to it until now. We would have had a couple of patches in
bluetooth-next that we'd still have wanted to get to 4.10.

Out of these the most critical one is the H7/CT2 patch for Bluetooth
Security Manager Protocol, something that couldn't be published before
the Bluetooth 5.0 specification went public (yesterday). If these really
can't go to net-next we'll likely be sending at least this patch through
bluetooth.git to net.git for rc1 inclusion.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>