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

[Mark Brown]

Hi all,

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

  net/bluetooth/mgmt.c
  net/bluetooth/mgmt_util.c
  net/bluetooth/mgmt_util.h

between commit:

  302a1f674c00d ("Bluetooth: MGMT: Fix possible UAFs")

from the net tree and commit:

  3b3eb857d5ab6 ("Bluetooth: MGMT: Fix possible UAFs")

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/mgmt.c
index 225140fcb3d6c,ee7068fb9fb59..0000000000000
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
diff --cc net/bluetooth/mgmt_util.c
index aa7b5585cb268,258c22d38809a..0000000000000
--- a/net/bluetooth/mgmt_util.c
+++ b/net/bluetooth/mgmt_util.c
diff --cc net/bluetooth/mgmt_util.h
index bcba8c9d89528,e94738d992900..0000000000000
--- a/net/bluetooth/mgmt_util.h
+++ b/net/bluetooth/mgmt_util.h

Attachment: signature.asc
Description: PGP signature