From: Eric Paris <eparis@redhat•com>
To: David Howells <dhowells@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Al Viro <viro@ZenIV•linux.org.uk>,
linux-next@vger•kernel.org, James Morris <jmorris@namei•org>,
Serge Hallyn <serue@us•ibm.com>
Subject: Re: linux-next: manual merge of the audit tree
Date: Wed, 10 Dec 2008 14:01:41 -0500 [thread overview]
Message-ID: <1228935701.3524.3.camel@localhost.localdomain> (raw)
In-Reply-To: <13157.1228935509@redhat.com>
On Wed, 2008-12-10 at 18:58 +0000, David Howells wrote:
> Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> > Today's linux-next merge of the audit tree got a lot of conflict in
> > include/linux/audit.h, kernel/auditsc.c, kernel/capability.c and
> > security/commoncap.c against commits in the security-testing tree.
> >
> > Its not obvious how to resolve these, so can you, Eric, James and Dave
> > have a conversation and see what you can come up with. Some will be
> > easy, but there are several overlapping changes here.
> >
> > Looking harder, it looks like some (all?) of Eric's patches may already
> > be in the security-testing tree ...
> >
> > I have dropped the audit tree for today.
>
> I've looked at all the conflicting bits, and I think you should take what's in
> the security tree over what's in Al's tree for all of them. I think the
> security tree already has everything that Al's tree applies in the conflicting
> areas, it's just that the security tree has further changes parked on top.
>
> David
I think David is right, all the conflicts should come from
security-testing. Al does have other good stuff in his tree though, Al
do you want to just kick all of my patches out?
-Eric
next prev parent reply other threads:[~2008-12-10 19:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 6:57 linux-next: manual merge of the audit tree Stephen Rothwell
2008-12-10 18:58 ` David Howells
2008-12-10 19:01 ` Eric Paris [this message]
2008-12-10 19:33 ` David Howells
2008-12-11 6:31 ` Al Viro
2008-12-11 9:01 ` Stephen Rothwell
2008-12-10 23:28 ` Al Viro
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=1228935701.3524.3.camel@localhost.localdomain \
--to=eparis@redhat$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=serue@us$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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