Linus Torvalds <torva...@linux-foundation.org> writes: > On Sat, Dec 15, 2012 at 12:28 AM, James Morris <jmor...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
