Messages in this thread | | | From | Linus Torvalds <> | Date | Sun, 16 Dec 2012 15:51:05 -0800 | Subject | Re: [GIT] Security subsystem updates for 3.8 |
| |
On Sat, Dec 15, 2012 at 12:28 AM, James Morris <jmorris@namei.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.
Linus
| |