[lkml]   [2013]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the bluetooth tree with the wireless tree
Hi Stephen,

2013-09-27 Stephen Rothwell <>:

> Hi Gustavo,
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_core.c between commit 5e130367d43f ("Bluetooth:
> Introduce a new HCI_RFKILLED flag") from the wireless tree and commit
> 0736cfa8e5bb ("Bluetooth: Introduce user channel flag for HCI devices")
> from the bluetooth tree.

Thanks for reporting, I knew about it about but didn't had any time to fix it
yesterday. I just merged bluetooth.git on bluetooth-next.git and fixed this.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> P.S. that closing brace is badly indented :-(

Yeah, it is now fixed on bluetooth-next at least.


 \ /
  Last update: 2013-09-27 17:21    [W:0.026 / U:1.740 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site