Linville update wireless-2.6/everything

[Dan Williams]

On Tue, 2007-12-04 at 10:06 -0500, John W. Linville wrote:
> On Tue, Dec 04, 2007 at 02:49:55PM +0000, David Woodhouse wrote:
> > 
> > On Tue, 2007-12-04 at 15:36 +0100, Holger Schurig wrote:
> > > wireless-2.6/everything now contains all patches from me that Dan 
> > > acked.
> > 
> > Argh. 
> > 
> > John, please could you hold off on applying libertas patches. We're
> > putting put them in the libertas git tree. You can pull that into a
> > 'libertas' branch of your own tree, if you want them to end up in your
> > 'everything' branch. Please don't rebase (even when you incorporate
> > stuff into the 'everything' branch); just pull.
> 
> Dan ACKed those patches -- why shouldn't they have been merged?
> Aren't your patches going on top of them?
> 
> FWIW, some of the biggest merge pains I've ever had came out of libertas
> trees -- ones that didn't bother to rebase on recent Linus trees.
> You'll have to excuse me if I'm not excited about a new libertas tree.
> 
> I just sent an email on another thread describing a methodology that
> I think works very well.  I wish the libertas team would adopt it.

>From my perspective, libertas is fully merged, and all patches should be
going through you.

The problem here is that David has a pretty big rework coming along, and
Holger still wants to keep cleaning things up (like the scan rework), so
they really do need to work together otherwise one of them gets screwed.
How David chooses to do that work together bit is his decision, because
he (or Holger) is going to be the person who ends up doing the merge
with you before they send you the megapatch.  So David needs to do the
cost/benefit analysis of whether his time is worth basing off Linus as
opposed to you.  IMHO the patches that are queued up in your tree are
perfectly valid to go upstream to Jeff; David just needs to handle that.
That's the way things work.

Dan

> FWIW I thought they _had_ adopted it (or something similar) -- it
> has been a long time since I've had trouble merging patches from Dan
> or Holger.  From the changelogs it is hard for me to imagine that we
> have stifled productivity on libertas...
> 
> Anyway, that is basically all the libertas patches I have ATM.
> If you don't want any more to be merged, then don't send them until
> you are ready.
> 
> Thanks,
> 
> John