From: Paul Moore <pmoore@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrei Emeltchenko <andrei.emeltchenko@intel.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org,
"Gustavo F. Padovan" <padovan@profusion.mobi>
Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree
Date: Thu, 05 Jan 2012 16:25:53 -0500 [thread overview]
Message-ID: <27624574.j8RvKjachg@sifl> (raw)
In-Reply-To: <20120105151255.f72ad113a93493bb55844034@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-01-05 21:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 4:12 linux-next: manual merge of the selinux tree with the net-next tree Stephen Rothwell
2012-01-05 4:12 ` Stephen Rothwell
2012-01-05 21:25 ` Paul Moore [this message]
2012-01-05 22:15 ` Stephen Rothwell
2012-01-05 22:51 ` Eric Paris
2018-03-05 1:40 Stephen Rothwell
2018-03-05 7:03 ` Xin Long
2018-03-07 16:34 ` Paul Moore
2018-03-07 16:41 ` David Miller
2018-03-07 17:27 ` Paul Moore
2018-03-07 17:45 ` David Miller
2018-03-07 20:20 ` Paul Moore
2018-03-07 20:24 ` David Miller
2018-03-07 20:26 ` David Miller
2018-03-07 23:28 ` Paul Moore
2018-03-08 2:07 ` Stephen Rothwell
2018-03-08 13:00 ` Paul Moore
2018-03-08 13:12 ` Xin Long
2018-03-08 13:29 ` Xin Long
2018-03-09 12:52 ` Marcelo Ricardo Leitner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27624574.j8RvKjachg@sifl \
--to=pmoore@redhat.com \
--cc=andrei.emeltchenko@intel.com \
--cc=davem@davemloft.net \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=padovan@profusion.mobi \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.