Subject: Re: linux-next: manual merge of the audit tree

From: David Howells <[email-masked]>
Date: Wed, 10 Dec 2008 19:33:03 +0000

Eric Paris <[email-masked]> 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.

David