* linux-next: manual merge of the bluetooth tree with Linus tree
@ 2011-11-08 1:58 Stephen Rothwell
2011-11-08 2:26 ` Wu Fengguang
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-11-08 1:58 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: linux-next, linux-kernel, Johan Hedberg
[-- 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* (no subject) 2011-11-08 1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell @ 2011-11-08 2:26 ` Wu Fengguang 2011-11-08 4:40 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Wu Fengguang @ 2011-11-08 2:26 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel Hi Stephen, I'm moving back to kernel.org and would you please switch git://github.com/fengguang/linux.git#writeback-for-next to git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next The branch is now emptied and will be populated with patches soon. Thanks, Fengguang ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 2011-11-08 2:26 ` Wu Fengguang @ 2011-11-08 4:40 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2011-11-08 4:40 UTC (permalink / raw) To: Wu Fengguang; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 471 bytes --] Hi, On Tue, 8 Nov 2011 10:26:31 +0800 Wu Fengguang <fengguang.wu@intel.com> wrote: > > I'm moving back to kernel.org and would you please switch > > git://github.com/fengguang/linux.git#writeback-for-next > > to > > git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next OK, I have switched to that now. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-08 4:40 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-11-08 1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell 2011-11-08 2:26 ` Wu Fengguang 2011-11-08 4:40 ` Stephen Rothwell
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).