linux-kernel - linux-next: manual merge of the akpm tree with the wireless tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 16 Feb 2012 16:05:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Manoj Iyer <manoj.iyer@...onical.com>,
	Johan Hedberg <johan.hedberg@...el.com>,
	"John W. Linville" <linville@...driver.com>,
	"James M. Leddy" <james.leddy@...onical.com>
Subject: linux-next: manual merge of the akpm tree with the wireless tree

Hi Adnrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/bluetooth/btusb.c between commit 403f048a5705 ("Bluetooth: btusb:
Add vendor specific ID (0a5c 21f3) for BCM20702A0") from the wireless
tree and commit "bluetooth: add support for BCM20702A0 [0a5c:21e6]" from
the akpm tree.

I fixed it up (see below) an can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/bluetooth/btusb.c
index 789c9b5,e618cf1..0000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -102,7 -102,7 +102,8 @@@ static struct usb_device_id btusb_table
  
  	/* Broadcom BCM20702A0 */
  	{ USB_DEVICE(0x0a5c, 0x21e3) },
+ 	{ USB_DEVICE(0x0a5c, 0x21e6) },
 +	{ USB_DEVICE(0x0a5c, 0x21f3) },
  	{ USB_DEVICE(0x413c, 0x8197) },
  
  	{ }	/* Terminating entry */

Content of type "application/pgp-signature" skipped