[Ieee80211-devel] Re: ieee80211 patches

[Jeff G. <jg...@po...>]

James Ketrenos wrote:
> Jeff Garzik wrote:
> 
> 
>>Jiri Benc wrote:
>>
>>
>>>Our patches against latest ieee80211 branch can be found at
>>>http://kernel.org/pub/linux/kernel/people/jbenc/
>>
>>Thanks for your patience.
>>
>>To answer Pavel's question from the other email:
>>
>>I was hoping that Intel would resend their patches, rediffed to the
>>latest ieee80211 branch.  I didn't want to apply all these cleanups,
>>which would then force Intel to rediff _yet again_.
> 
> 
> When it rains it pours it seems... we finally had the time to split up
> the commit Jiri originally asked us to split up; in doing so we rebased
> the commit series against netdev-2.6#ieee80211 as of Aug 15th (commit
> 1b5cca3a88b7682d538d129c25f0e3092613a243)
> 
> When we rebased, the first commit was a run scripts/Lindent and trimmed
> all trailing whitespace on include/net/ieee80211*.h and
> net/ieee80211/*.c.  This makes the first patch in the series large, but
> it is purely a Lindent patch.  Running it as the first step in the
> rebase helped resolve any conflicts later (if you're interested in the
> 'clean-rebase' script it will apply non Lindent'd patches back into a
> Lindented tree without Lindent caused conflicts).
> 
> Anyway, our rebasing from ieee80211 up to the latest development tip is
> done across 29 commits, with a series size of 225k.
> 
> We have an updated GIT overlay of the rebased ieee80211 at
> rsync://bughost.org/repos/ieee80211-rebase/.git/.  If you just want to
> pull the objects/ tree, you can walk it via the commit
> 69b08411732dfc5a028ef19fc6c79b84302c4c30.  NOTE:  The GIT overlay
> referenced here is not a full archive.  It only contains the objects
> required to move from the parent (netdev-2.6#ieee80211) to the master. 
> Once pulled you can use many of the git commands, but others (like
> checkout) will likely fail.
> 
> We are willing to keep a ieee80211 GIT tree up to date w/ everyone's
> patches that you can just periodically pull from if you'd like.  We
> already have to maintain a separate tree anyway to enable updates and
> snapshots for the ipw2{1,2}00 project users.  This is partially what is
> causing us pain right now; any set of patches we apply may later end up
> being conflicts when we try and merge back with netdev -- which means
> the merge rarely occurs.  At the same time, we can't always wait for a
> patch to be incorporated into netdev-2.6#ieee80211 before we make it
> available to users.
> 
> Anyway, here is the shortlist of the changes we have for ieee80211,
> available from the above rsync location.
> 
> (As a side note, we're working on a similar set for the ipw2{1,2}00
> drivers that catch them up to being compatible with this version of
> ieee80211, etc.  That series is 52 patches, breaking in at just over 1M.)

It seems like some of this overlaps changes already in upstream.  What's 
the best way to start this process?  I would prefer to receive patches 
rather than 'git pull' at the present time.

Should I Lindent the files first?
Would you rather just start sending those 50+ patches?

	Jeff