lkml.org 
[lkml]   [2012]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT] Security subsystem updates for 3.8
Linus Torvalds <torvalds@linux-foundation.org> writes:

> 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.

I just read through the conflict resolution and I don't see any
kuid/kgid problems. I am surprised that there were any kuid/kgid
conflicts as all of my changes in that area were in 3.6-rc1.

Eric


\
 
 \ /
  Last update: 2012-12-17 05:41    [W:0.206 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site