Messages in this thread | | | From | Linus Torvalds <> | Date | Wed, 27 Jul 2011 20:38:57 -0700 | Subject | Re: [GIT] Security subsystem changes for 3.1 |
| |
On Wed, Jul 27, 2011 at 8:20 PM, James Morris <jmorris@namei.org> wrote: > > 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?
No. He's the VFS maintainer, he can do the VFS changes he likes.
James, these things happen. It's *normal* to have a certain amount of overlap. I just want to know about it when it happens, because sometimes (thankfully very rarely) there are also then semantic changes involved, and repeated clashes tend to mean that something is badly abstracted or whatever.
So conflicts aren't "bad" per se. I want to see them, because they're a kind of heads-up for me: while any individual conflict isn't necessarily a problem at all, it's something that I just want to be aware of.
So I am not complaining about - or finding it disturbing - that we had a conflict. It's all par for the course. But I don't want submaintainers to merge the conflicts away.
Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |