archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Gustavo Padovan <>
	Petri Gynther <>,
	Marcel Holtmann <>,
	Johan Hedberg <>
Subject: linux-next: manual merge of the bluetooth tree with Linus' tree
Date: Fri, 9 May 2014 11:41:49 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
drivers/bluetooth/btusb.c between commit 3c49aa852e00 ("Revert
"Bluetooth: Enable autosuspend for Intel Bluetooth device"") from
Linus' tree and commit 10d4c6736ea6 ("Bluetooth: btusb: Add Broadcom
patch RAM support") from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc drivers/bluetooth/btusb.c
index a7dfbf9a3afb,8f579cd9bbaf..000000000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1486,8 -1635,13 +1636,11 @@@ static int btusb_probe(struct usb_inter
  	if (id->driver_info & BTUSB_BCM92035)
  		hdev->setup = btusb_setup_bcm92035;
+ 	if (id->driver_info & BTUSB_BCM_PATCHRAM)
+ 		hdev->setup = btusb_setup_bcm_patchram;
 -	if (id->driver_info & BTUSB_INTEL) {
 -		usb_enable_autosuspend(data->udev);
 +	if (id->driver_info & BTUSB_INTEL)
  		hdev->setup = btusb_setup_intel;
 -	}
  	/* Interface numbers are hardcoded in the specification */
  	data->isoc = usb_ifnum_to_if(data->udev, 1);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-05-09  1:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-09  1:41 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-03-01  1:54 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2011-11-08  1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell
2011-11-04  2:55 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2011-10-25  6:25 Stephen Rothwell
2011-04-28  1:34 Stephen Rothwell
2011-04-28  3:36 ` Gustavo F. Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).