I personally think the merging is distributed, and done by each
subsystem maintainer. When that doesn't happen, and the merge is
non-trivial, we often see a message by Linus essentially saying "your
patch is cool, but it conflicts with another patch by <foo> that does
<bar>, so I've done a new pre with <foo>'s patch, could you merge and
rediff against it?".
OG.
-
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/