From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932869Ab2AEV0H (ORCPT ); Thu, 5 Jan 2012 16:26:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47280 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758302Ab2AEV0E (ORCPT ); Thu, 5 Jan 2012 16:26:04 -0500 From: Paul Moore To: Stephen Rothwell Cc: Eric Paris , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrei Emeltchenko , David Miller , netdev@vger.kernel.org, "Gustavo F. Padovan" Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree Date: Thu, 05 Jan 2012 16:25:53 -0500 Message-ID: <27624574.j8RvKjachg@sifl> Organization: Red Hat User-Agent: KMail/4.7.4 (Linux/3.1.5-gentoo; KDE/4.7.4; x86_64; ; ) In-Reply-To: <20120105151255.f72ad113a93493bb55844034@canb.auug.org.au> References: <20120105151255.f72ad113a93493bb55844034@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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