[lkml]   [2012]   [Jun]   [12]   [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,

* Stephen Rothwell <> [2012-06-12 11:47:01 +1000]:

> Hi Gustavo,
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_event.c between commit 1c2e00418317 ("Bluetooth: Add
> support for encryption key refresh") from the wireless tree and commit
> 6039aa73a132 ("Bluetooth: Remove most of the inline usage") from the
> bluetooth tree.

That is because I just merged bluetooth tree into bluetooth-next, should be
fixed on wireless-next once I do a pull request to John(this is already fixed
in bluetooth-next). Thanks for spotting me this.

[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-06-12 09:01    [W:0.040 / U:2.704 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site