Linville update wireless-2.6/everything

John W. Linville linville at tuxdriver.com
Tue Dec 4 10:53:49 EST 2007


On Tue, Dec 04, 2007 at 04:32:07PM +0100, Holger Schurig wrote:
> > it has been a long time since I've had
> > trouble merging patches from Dan or Holger.
> 
> That was because I always worked against wireless-2.6/everything 
> and almost daily do:
> 
> cd wireless-2.6 
> quilt pop -a
> git checkout -f master
> git pull
> git branch -D everything
> git checkout -b everything origin/everything
> quilt push -a
> 
> ... and the fixing my patches if they broke.

That seems to be working well at this end.

> > From the changelogs it is hard for me to imagine that we
> > have stifled productivity on libertas...
> 
> The idea of a new libertas-2.6 tree came up because there was a 
> time where no (already acked) libertas patch went into 
> wireless-2.6/everything. I think this period was 8 or 9 days 
> long.

Most of that time was around the US Thanksgiving holiday.  Also this
year Jeff Garzik was on vacation just before Thanksgiving, so I may
have been a bit slack with pushing driver updates since they would
mostly go to /dev/null.  I honestly don't believe this is a typical
situation.

> Some of my patches were quite intrusive (e.g. the lbs-namespace 
> patch). Now David wanted to create a bunch of intrusive patches, 
> too. We thought that a local tree that is up-to-date for us 
> libertas-developers (because we directly push into it) would be 
> a good idea to have a common base for us.

The two of you working together to pre-merge your big patches sounds
great.  I still don't see how I have disturbed that.

John
-- 
John W. Linville
linville at tuxdriver.com



More information about the libertas-dev mailing list