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

[Mark Brown]

Hi all,

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

  drivers/bluetooth/btusb_main.c

between commits:

  f92634ad91863 ("Bluetooth: btusb: Build the driver from multiple source files")
  8b1bfabebfa40 ("Bluetooth: btusb: Add support for Qualcomm multi-subsystem QCC2072")

from the bluetooth tree and commits:

  f92634ad91863 ("Bluetooth: btusb: Build the driver from multiple source files")
  8b1bfabebfa40 ("Bluetooth: btusb: Add support for Qualcomm multi-subsystem QCC2072")

from the bluetooth tree.  Yes, that's the same two commits.  I suspect
something to do with your constant cherry picking and prior fixes having
been merged managed to generate a conflict on the source file spilt, I
imagine it's something pulled over from another file.

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_main.c
index 002b9f975710f,be47ac894b6cc..0000000000000
--- a/drivers/bluetooth/btusb_main.c
+++ b/drivers/bluetooth/btusb_main.c
@@@ -69,8 -71,18 +71,21 @@@ static struct usb_driver btusb_driver
  #define BTUSB_ACTIONS_SEMI		BIT(27)
  #define BTUSB_BARROT			BIT(28)
  #define BTUSB_BROKEN_EXT_SCAN		BIT(29)
++<<<<<<< HEAD:drivers/bluetooth/btusb.c
++=======
+ #define BTUSB_QUALCOMM			BIT(30)
++>>>>>>> bluetooth/master:drivers/bluetooth/btusb_main.c
  
  static const struct usb_device_id btusb_table[] = {
+ 	/*
+ 	 * NXP IW610 (0471:0215): the composite device reports Bluetooth
+ 	 * class at the whole-device level, so the generic entry below
+ 	 * would also match this WiFi vendor interface. Ignore it here
+ 	 * first so mwifiex-nxp can bind it instead.
+ 	 */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(0x0471, 0x0215, 0xff, 0xff, 0xff),
+ 	  .driver_info = BTUSB_IGNORE },
+ 
  	/* Generic Bluetooth USB device */
  	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
  
@@@ -983,6 -1016,9 +1019,12 @@@ struct btqca_data 
  #define BTUSB_HW_SSR_ACTIVE	17
  #define BTUSB_WAKEUP_BROKEN	18
  #define BTUSB_RESET		19
++<<<<<<< HEAD:drivers/bluetooth/btusb.c
++=======
+ 
+ #define BTUSB_PROTO_LEGACY	0x00
+ #define BTUSB_PROTO_H4		0x01
++>>>>>>> bluetooth/master:drivers/bluetooth/btusb_main.c
  
  struct btusb_data {
  	struct hci_dev       *hdev;
diff --cc net/bluetooth/hci_sync.c
index 2a651a4d60e64,51d03cd3c963a..0000000000000
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
diff --cc net/bluetooth/l2cap_core.c
index 644e31160d55b,a22edd2baf5e5..0000000000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -3900,7 -4009,8 +4009,11 @@@ static void l2cap_ecred_rsp_defer(struc
  	struct l2cap_ecred_rsp_data *rsp = data;
  	struct l2cap_ecred_conn_rsp *rsp_flex =
  		container_of(&rsp->pdu.rsp, struct l2cap_ecred_conn_rsp, hdr);
+ 	bool locked;
+ 
++	if (chan->mode != L2CAP_MODE_EXT_FLOWCTL)
++		return;
 +
  	if (chan->mode != L2CAP_MODE_EXT_FLOWCTL)
  		return;

Attachment: signature.asc
Description: PGP signature