From: Paul Moore <paul.moore@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
James Morris <jmorris@namei.org>
Cc: linux-next@vger.kernel.org, David Howells <dhowells@redhat.com>,
Casey Schaufler <casey@schaufler-ca.com>
Subject: Re: linux-next: manual merge of the lblnet tree
Date: Mon, 8 Dec 2008 14:41:12 -0500 [thread overview]
Message-ID: <200812081441.12338.paul.moore@hp.com> (raw)
In-Reply-To: <20081208190708.1d2c37ec.sfr@canb.auug.org.au>
On Monday 08 December 2008 3:07:08 am Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflicts in
> security/smack/smack_lsm.c and security/smack/smackfs.c between
> commits 86a264abe542cfececb4df129bc45a0338d8cdb9 ("CRED: Wrap
> current->cred and a few other accessors") and
> d84f4f992cbd76e8f39c488cf0c5d123843923b1 ("CRED: Inaugurate COW
> credentials") from the security-testing tree and commit
> d936691ab765fbac809e9a05c7f0c36ce2c2119e ("smack: Add support for
> unlabeled network hosts and networks") from the lblnet tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
Thanks Stephen. It sounds like both David and Casey are okay with the
changes so I have no arguments with the fix-up patch.
James, is the security-testing tree rebased regularly or is suitable to
back a tree against? If so, I can rebase the lblnet-2.6_next tree
against security-testing to resolve the conflict ...
--
paul moore
linux @ hp
next prev parent reply other threads:[~2008-12-08 19:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 8:07 linux-next: manual merge of the lblnet tree Stephen Rothwell
2008-12-08 10:46 ` David Howells
2008-12-08 16:09 ` Casey Schaufler
2008-12-08 19:41 ` Paul Moore [this message]
2008-12-08 21:16 ` James Morris
2008-12-08 22:58 ` Paul Moore
2008-12-09 4:15 ` Casey Schaufler
2008-12-10 17:05 ` Casey Schaufler
2008-12-10 17:34 ` Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2008-12-08 7:49 Stephen Rothwell
2008-12-08 19:38 ` Paul Moore
2008-12-08 20:19 ` Jean Delvare
2008-12-09 0:23 ` Stephen Rothwell
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=200812081441.12338.paul.moore@hp.com \
--to=paul.moore@hp.com \
--cc=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).