Re: [GIT] Security subsystem changes for 3.1

[David Miller]

From: James Morris <jmorris@xxxxxxxxx>
Date: Thu, 28 Jul 2011 13:20:35 +1000 (EST)

> 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?

I think Linus is trying to say that you should have not done the merge
to resolve the conflict and simply let him take care of it when he
pulled your tree.
--
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/