Linus Torvalds <torva...@linux-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 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/
