[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT] Security subsystem changes for 3.1
    On Wed, 27 Jul 2011, Linus Torvalds wrote:

    > On Wed, Jul 27, 2011 at 7:42 PM, James Morris <> wrote:
    > >
    > > Ok, but this conflict was in my subsystem.
    > .. but it was a conflict that came from the VFS subsystem changes.
    > So it was clearly a cross-subsystem conflict. The fact that the file
    > was in what you consider your subsystem IS TOTALLY IRRELEVANT. Because
    > clearly somebody ELSE considered the change that conflicted to be part
    > of THEIR subsystem!

    Ok. So what should have happened here (fb408e6ccc) is that Al should have
    emailed the patch to me to apply to my tree, instead of pushing it

    - James
    James Morris

     \ /
      Last update: 2011-07-28 05:23    [W:0.019 / U:0.296 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site