Messages in this thread | | | Date | Thu, 3 Mar 2005 22:17:45 -0800 | From | Andrew Morton <> | Subject | Re: [PATCH] trivial fix for 2.6.11 raid6 compilation on ppc w/ Altivec |
| |
Jeff Garzik <jgarzik@pobox.com> wrote: > > > Olof's patch is in the linux-release tree, so this brings up a point > > regarding merging. If the quick fix is to be replaced by a better fix > > later (as in this case) there's some room for merge conflict. Does this > > pose a problem for either -mm or Linus' tree? > > Just need to make sure <whomever> aware of this, when you push to Linus. > > In most cases, of dire fixes, they should just go into linux-release, > and then get pulled into linux-2.6. > > For a few cases, like this one, the quick fix will hit linux-release and > linux-2.6 before the better fix, so no big deal. > > In a few rare cases, you will need to create a "for-upstream" tree that > handles the conflict before it get pushed to Linus.
As I say, it sounds dumb, but I'm sure you can make it work ;)
The main person it affects is yours truly:
bix:/usr/src/25> grep fix series | wc -l 162
And fixes which are 2.6.x.y material need to go mm->linux_release->linus. I drop them when they turn up in Linus's tree.
That works as long as I don't have non-linux_release patches which depend upon earlier fixes. If that happens I have to wait until linux-release merges up.
Again, it's manageable, but complex. - 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/
| |