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 filewas in what you consider your subsystem IS TOTALLY IRRELEVANT. Becauseclearly somebody ELSE considered the change that conflicted to be partof THEIR subsystem!

See?

So by definition, if you get conflicts with something that has comeinto my tree from somebody else, then it is a cross-subsystemconflict. What file it happens in (and whether you consider it "your"file or not) is entirely irrelevant - because the important part isthat two different maintainers worked on the same area. That's thedefinition of 'cross-subsystem conflict'.

In contrast, if you merge two different branches that you yourselfmaintain, and have conflicts there, that's an "internal" conflict asfar as maintenance is concerned. I don't particularly care about thoseinternal conflicts, but you might want to talk to the people you workwith if you have lots of them..