archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: "Gustavo F. Padovan" <>
	Johan Hedberg <>
Subject: linux-next: manual merge of the bluetooth tree with Linus tree
Date: Tue, 8 Nov 2011 12:58:22 +1100	[thread overview]
Message-ID: <> (raw)

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

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/mgmt.c between commit dafbde395ed5 ("Bluetooth: Set
HCI_MGMT flag only in read_controller_info") from Linus' tree and commit
e395042c2836 ("Bluetooth: Convert power off mechanism to use
delayed_work") from the bluetooth tree.

I fixed it up and can carry the fix as necessary.
Stephen Rothwell          

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

             reply	other threads:[~2011-11-08  1:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-08  1:58 Stephen Rothwell [this message]
2011-11-08  2:26 ` (unknown) Wu Fengguang
2011-11-08  4:40   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-05-09  1:41 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2013-03-01  1:54 Stephen Rothwell
2011-11-04  2:55 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).