Re: [GIT] Security subsystem changes for 3.1

[James Morris]

On Wed, 27 Jul 2011, Linus Torvalds wrote:

> On Wed, Jul 27, 2011 at 7:42 PM, James Morris <jmorris@xxxxxxxxx> 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@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/