Re: merge status

[Andrew Morton]

Jens Axboe <axboe@xxxxxxx> wrote:
>
> On Thu, Nov 10 2005, Andrew Morton wrote:
> > Jens Axboe <axboe@xxxxxxx> wrote:
> > >
> > >  It's more of a "I don't feel like spending 1-2 hours making and testing
> > >  a -mm version"
> > 
> > There shouldn't be a need for special -m version of patches.  Very usually
> > the diff-against-linus can be made to work quite easily.  Sufficiently
> > easily that I resync with all the git trees a couple of times a day.
> 
> Often the patch itself may not take too much work, but you still need to
> set up a -mm test directory, compile, boot, and test the stuff.

Most of the other git-tree maintainers don't bother with any of that. 
acpi, agp, alsa, arm, ...  xfs.  The trees which have special -mm branches
are just drm, ieee1394, jfs, mips and netdev.

Where it all comes unstuck at present is if a maintainer has multiple
branches, and some of those branches contains diffs which are in other
branches.  If that happens, the diffs I generate throw huge rejects. 
But even then, if one branch is a strict superset of another, I can just
pull the superset one.
-
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/