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 a conflict in:

  drivers/bluetooth/btusb.c

between commit:

  e486a891c412d ("Bluetooth: btusb: mediatek: Fix leaked runtime PM reference in reset")

from the net tree and commit:

  6d437db48c781 ("Bluetooth: btusb: mediatek: Fix leaked runtime PM reference in reset")

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 drivers/bluetooth/btusb.c
index 002b9f975710f,a47b51ffdcd0c..0000000000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c

Attachment: signature.asc
Description: PGP signature