Hi all, Today's linux-next merge of the bluetooth tree got a conflict in: net/bluetooth/hci_conn.c between commit: 5dc7d23e167e2 ("Bluetooth: hci_conn: Fix possible UAF") from the origin tree and commit: 0623067085473 ("Bluetooth: hci_conn: Fix possible UAF") 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 --cc net/bluetooth/hci_conn.c index 8455ba141ee61,640b951bf40a1..0000000000000 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c