lkml.org 
[lkml]   [2012]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the selinux tree with the net-next tree
Date
On Thursday, January 05, 2012 03:12:55 PM Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the selinux tree got a conflict in
> net/bluetooth/l2cap_sock.c between commit 15770b1ab974 ("Bluetooth:
> convert force_active variable to flag in l2cap chan") from the net-next
> tree and commit 53860f3d0499 ("bluetooth: Properly clone LSM attributes
> to newly created child connections") from the selinux tree.
>
> These both remove the same line, but there is probably something more
> subtle going on ... I just used the version from the net-next tree.

Something is a bit odd. When I look in the current linux-next tree I see two
commits which fix a Bluetooth/LSM bug; the first is correct, the second one
appears to be some other commit which just hijacked the description from the
first ... I have no idea what is going on in the second commit; I'll leave
that to you git gurus :)

* Correct commit -> 6230c9b4f8957c8938ee4cf2d03166d3c2dc89de

* Garbage commit -> 53860f3d0499992855d58e33f0f79bfe642dfccb
--
paul moore
virtualization @ redhat



\
 
 \ /
  Last update: 2012-01-05 22:29    [from the cache]
©2003-2011 Jasper Spaans