From: Al Viro <viro@ZenIV•linux.org.uk>
To: David Howells <dhowells@redhat•com>
Cc: Eric Paris <eparis@redhat•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
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: Thu, 11 Dec 2008 06:31:38 +0000 [thread overview]
Message-ID: <20081211063138.GP28946@ZenIV.linux.org.uk> (raw)
In-Reply-To: <13530.1228937583@redhat.com>
On Wed, Dec 10, 2008 at 07:33:03PM +0000, David Howells wrote:
> Eric Paris <eparis@redhat•com> wrote:
>
> > 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?
>
> Maybe it's worth James taking Al's changes into his tree and resolving all the
> conflicts in favour of what's in his tree.
It's already done. Everything that used to be in for-linus except
tty_audit.c one went into mainline; tty_audit got rediffed and sent
to James; for-linus..for-next had several Eric's patches that were
in security tree (and thus are dropped from audit one - I couldn't
care less which tree are they merged from as long as they get into
the mainline) and an s390 patch that got sent off to linux-s390@vger
and would be better off going via the s390 tree anyway.
So at this point everything in that branch is taken care of. I do have
several more in a private queue, but those will need review and testing
before they go into -next.
next prev parent reply other threads:[~2008-12-11 6:31 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
2008-12-10 19:33 ` David Howells
2008-12-11 6:31 ` Al Viro [this message]
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=20081211063138.GP28946@ZenIV.linux.org.uk \
--to=viro@zeniv$(echo .)linux.org.uk \
--cc=dhowells@redhat$(echo .)com \
--cc=eparis@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 \
/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