On Tue, Sep 12, 2017 at 4:24 PM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Sep 12, 2017 at 10:33 AM, Paul Moore <paul@xxxxxxxxxxxxxx> wrote: >> As discussed on the linux-security pull request thread, this is the >> direct SELinux pull request; the content/tag is the same as what I >> sent to James/linux-security earlier: > > The contents may be the same, but the base is different. > > In particular, you based it on the security tree that already had a > few other patches, so now that branch contains not just selinux work, > but also a couple of tomoyo patches that came in that way. > > Anyway, I pulled this simply because it was easier to review and > didn't have anything I disliked per se, but if we're going to actually > keep the different securlty layers separate, they need to also have > clean bases for the work in the future. > > Anyway, I'm at the airport on my way back home, and hopefully I'll be > back to normal tomorrow after a good night's sleep, and I can take a > look at the rest. Oof, sorry about the base mixup; I'll change the SELinux tree base moving forward so this shouldn't happen again. -- paul moore www.paul-moore.com
