[lkml]   [2012]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT] Security updates for 3.3: SELinux
    On Sat, 14 Jan 2012, Linus Torvalds wrote:

    > Now, if it's a trivial merge, it needs no explanation (although I also
    > prefer that it not be done, so that I can see even those), but
    > something like this where you actually need to resolve a semantic
    > conflict that doesn't cause any real physical conflict at all I really
    > prefer to be explained.

    Sorry, yep, I should have explained it.

    It was an odd situation in that it hadn't been in my tree at all thus far,
    so I wanted to do my own testing before requesting a pull to your tree.

    - James
    James Morris

     \ /
      Last update: 2012-01-15 05:07    [W:0.028 / U:75.636 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site