linux-next: manual merge of the bluetooth tree with the origin tree

Hi all,

Today's linux-next merge of the bluetooth tree got a conflict in:

  net/bluetooth/6lowpan.c

between commit:

  518aa9505fa10 ("Bluetooth: 6lowpan: hold L2CAP conn across debugfs control")

from the origin tree and commits:

  d740cf77461a4 ("Bluetooth: add annotations for l2cap_data locking context")
  d138ff8690c8e ("Bluetooth: 6lowpan: hold L2CAP conn across debugfs control")

from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined net/bluetooth/6lowpan.c
index d504a363a30f3,30f4afa18bc8f..0000000000000
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@@ -1007,6 -1007,8 +1007,8 @@@ static int get_l2cap_conn(char *buf, bd
  		return -ENOENT;
  	}
  
+ 	lockdep_assert_held(&hcon->hdev->lock);
+ 
  	*conn = l2cap_conn_hold_unless_zero(hcon->l2cap_data);
  
  	BT_DBG("conn %p dst %pMR type %u", *conn, &hcon->dst, hcon->dst_type);

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpzSk8ACgkQJNaLcl1U
h9BL0gf/QLJncCmSz+n5SisG29xzP99OVhTMrlAeo4zHuxHDOBN2CrfMSTAUMG3E
lLnOC5AFnpTsSntI4S7CGD85MJdG23mEVu8YO1y9snuTVd0Xpg2pmqZZDVZjBYDF
WXbEgfT6a5wBb2pPkYgo3FWKSs66YURkhz7I/8I2vh/xyH64Swz2xp0I+vKrFu9Y
eFXesgZRk7gvhzFnHDcUOwp7Zld2PZfvZCVZImJOcBFUBxcEZIvpW3FtgTJZzhS4
4BYWxMuECARS+qBpAEtaif+osziHyZnvrALERHh6RZOpdSyvf7bmJXloume9xbdT
rn0VwvoFi6D4LybvwKXKpJy3r3bBrQ==
=Kthg
-----END PGP SIGNATURE-----