[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <2569.1355748725@warthog.procyon.org.uk>
Date: Mon, 17 Dec 2012 12:52:05 +0000
From: David Howells <dhowells@...hat.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: dhowells@...hat.com, James Morris <jmorris@...ei.org>,
LSM List <linux-security-module@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: Re: [GIT] Security subsystem updates for 3.8
Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> > A quiet cycle for the security subsystem with just a few maintenance
> > updates.
>
> Ok, pulled. There were a few trivial conflicts (mostly due to some of
> the key allocation patches having already been merged, and some of the
> kuid/kgid changes due to the userns changes).
>
> I'd like you to double-check the end result, but it *looks* fine.
> Adding both EricB and DavidH to the participants since the conflicts
> were generally due to intetractions with their patches.
There seemed to be a couple of minor bits that got lost. I'm not sure where,
though. I'll send them to you as additional patches. Other than that,
everything appears to have merged okay.
David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists