lkml.org 
[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
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 <jmorris@namei.org> 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
directly?


- James
--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2011-07-28 05:23    [from the cache]
©2003-2011 Jasper Spaans