Most if not all of my 2 week backlog of patches is in the net-2.6.24
and net-2.6 tree now.  And any relevant -stable fixes will be
submitted in the next day or two.

Tomorrow (Monday) I want to rebase the net-2.6.24 tree one more time
to deal with all of the conflicts which exist between
linux-2.6/net-2.6 and net-2.6.24, but I'll likely defer that
until the net-2.6 fixes I just pushed to Linus are integrated.

It's to the point where every single bug fix put into Linus's tree
creates a merge conflict with net-2.6.24, we are simply touching that
much stuff. :-)

I expect some small network namespace fixes from Eric B., but that's
basically it as far as 2.6.24 is concerned.  Oh yes, there are also
the MAC_FMT/MAC_ARG bits from Joe Perches that I need to do a merge
of.

The transmit batching stuff needs a lot more analysis and discussion,
so I definitely see that stuff as 2.6.25 material.  I think if we can
avoid a food fight between Jamal and Mr. Kumar and have healthy
discussions, we can end up with a really nice implementation.  So
everyone put your boxing gloves away and let's get at it. :-)

We've touched so much in net-2.6.24 that we really should be auditing
the thing and fixing any bugs that have been added.  If you're bored
and looking for something to do, pick an odd NAPI driver and audit it
in the net-2.6.24 tree.
-

From: David Miller <davem@davemloft.net>

I've just completed this rebase.

Andrew, I removed the troublesome IOAT patch.  The only conflicts
and fixes you should need at this point are:

1) Removal of SET_MODULE_OWNER() from any extra drivers you import
   into your tree.

2) dev_get_by_*() needs &init_net added as first parameter in any
   other code you import outside of the net tree.

I guess a lot of this could be avoided if I simply merge in whatever
external stuff you're sucking in.  I imagine this is just one of
Linville's trees (I'm surprised that hasn't been sent to me frankly)
and some specific new drivers you're merging in.

I don't want to sound like a control freak or a whiner, but these
merge conflicts are growing painful at an astronomic rate and I'd
therefore prefer if we simply push everything through the net-2.6.24
tree from now until the merge window.

Today's rebase took several hours and it took significantly longer to
suck in Jeff's netdev tree over the weekend.  I'm tired of playing
patch monkey, so I can sympathize with how life must be every day
for Andrew :-)  But on a more serious note there are things I have
to actually hack on myself so anything that decreases the amount of
time I spend doing mindless patch whacking in the net-2.6.24 tree is
appreciated.

What say you?
-

[...]

Which IOAT patch are you referring to?

sln
--
======================================================================
Mr. Shannon Nelson                 LAN Access Division, Intel Corp.
Shannon.Nelson@intel.com                I don't speak for Intel
(503) 712-7659                    Parents can't afford to be squeamish.
-

On Mon, 17 Sep 2007 16:57:03 -0700

A dopey one-liner which removes unused variable `u16 chanctrl'.  It caused
rather a mess due to all the dma changes we have queued.  It's under control.
-

From: "Nelson, Shannon" <shannon.nelson@intel.com>

The 'uninitialized variable' one, you should have a copy.
If not, Andrew definitely does.
-

On Mon, 17 Sep 2007 14:18:26 -0700 (PDT)


external stuff is mainly drivers.  These two:

git://porch.greyhouse.net/gospo/tehuti-2.6.git
ipg-add-ip1000a-driver-to-kernel-tree.patch


Yeah, git-net versus git-wireless isn't pretty.  The huge amount of pending
wireless stuff has been a bit of a nuisance for some months.  But it's
probably a bigger nuisance for John ;)

I don't know what remains to be done there, but it would be good to dig in
and get it all merged up.  Given the damage which net-2.6.24 does to


I'm finding that most problems are caused by maintainers committing stuff
to their git trees which affects code which other git-tree owners maintain.
Things like git-net playing with git-wireless code, git-block playing with
git-scsi-misc code, etc.

It would suit _me_ better if people were to try harder to merge changes via
the correct maintainer rather than going out-of-scope like this.  But it
would make life quite a lot harder for the people who are doing this

My current aggregate diff against 2.6.23-rc6 is 28.8MB.  I'm just sitting
here with my head spinning ;)

(I actually got it all to build, boot and run ltp, which was rather
stunning)
-

The stuff in wireless-dev is a collection of drivers (some of which
probably should be merged now) and some mac80211 gorp that is not
yet merge-worthy.  Trust me, I'm trying to get as many items out of

Yeah...<sigh>...yeah...<sigh>...yeah... :-(

But as hch would surely point-out, it is my own laziness at fault...and
driver authors who tremble in fear when I mention merging their
drivers upstream...but, I digress... :-)

I just (minutes ago) finished the mop-up of the patch mess which
had accumulated on me during my KS-related travel and the subsequent
period of catching-up.  (I'm sure I still missed something or botched
something).  I think I can get an -mm suitable patch together within
the next few hours.

John

P.S.  Andrew, I'll send you a link to a new git-wireless.patch --
I'm sure you don't want a complicated git invocation...  Until then,
I don't think you should try pulling wireless-dev...
-- 
John W. Linville
linville@tuxdriver.com
-

On Mon, 17 Sep 2007 19:18:30 -0400

OK, thanks.

The stuff I have now does actually compile, although the chances of it
actually working are epsilon.

So I'd rather not breathe on it today: I'l shove it out the door as-is
with a big "this is probably broken" label on it.   I'll at least test
ipw2200 before doing so.
-

Very reasonable -- I suspect even and "easy" -mm looks a lot like
the last few days have looked in my trees...

Anyway, I do have prepared an omnibus patch for you:

	http://www.kernel.org/pub/linux/kernel/people/linville/git-wireless-2007-09-17.patch

And FWIW, there is an 'mm-master' branch matching the usage to which
you are accustomed.  The git merge if you pull from that branch onto
net-2.6.24 is reasonably straight-forward and not too painful.  Still,
I'd recommend the patch at the URL above... :-)

Thanks,

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

Since Dave merged the drivers I sent him, the new omnibus patch you
want is this:

	http://www.kernel.org/pub/linux/kernel/people/linville/git-wireless-2007-09-18.patch

The good news is that it is 1/4 the size of its predecessor!

Hth!

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

And the latest incarnation:

	http://www.kernel.org/pub/linux/kernel/people/linville/git-wireless-2007-09-19-16-57-4...

And is even smaller...down an additional 30%, or almost 1/6th of the
original! :-)

Thanks,

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

http://www.kernel.org/pub/linux/kernel/people/linville/git-wireless-2007-09-20.patch

Even smaller, about 650k -- 80+% reduction in size, hooray!

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

From: "John W. Linville" <linville@tuxdriver.com>

Yes, great progress, thanks John :-)

So it looks like what's left is:

1) ATH5K driver
2) ATMEL USB driver
3) NL80211
4) misc bits sprinkled around mac80211
-

These are both really new.  I think I'll transfer them to my

I need to check w/ Johannes to see if the user-facing portions of

These bits are mostly pieces with unsettled user inferface issues
or unsettled features that still need some development.  I'll be
holding-on to these a while longer.

Thanks,

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

I have a patch to basically remove everything from nl80211 that we're
not using today, and make the interface well-defined so each type of
setting has methods to "new, del, get, set", for example create, remove,
get info or change a virtual interface. If you wish, I can post this
patch for inclusion into wireless-dev and then copy the resulting
nl80211 to net-2.6.24, including the mac80211 hooks to make use of it.
Shouldn't take more than a few hours.

johannes

Kalle Valo has done some work on this, and I think Eugene Teo has
joined the effort.  They both are in contact with Pavel to accomplish
the mac80211 port.

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

From: "John W. Linville" <linville@tuxdriver.com>

I'm happy you're taking care of this, but it would be nice if
you could sent this to me as patches for net-2.6.24 inclusion
as well :-)
-

From: Andrew Morton <akpm@linux-foundation.org>

Andrew, can you send these two to me under seperate cover?  I'll
integrate them once I have them in my inbox.

Why don't we sit a bit on the wireless tree, and John please start to
merge that stuff to net-2.6.24 and toss the patches my way?

Thanks!
-

On Mon, 17 Sep 2007 16:39:29 -0700 (PDT)

The Tehuti driver you should probably pull from the above git tree.

Andy sent me a fix-it-for-net-2.6.24 patch which I'll send.  It applies
on top of the git tree.

ipg-add-ip1000a-driver-to-kernel-tree.patch got broken by git-2.6.24 and I
just disabled it in Kconfig.  I'll send it anyway but someone will need to
repair it.  For some reason this driver doesn't have a changelog.

-

From: Andrew Morton <akpm@linux-foundation.org>

Ok I added in the Tehuti driver to net-2.6.24 and made sure the
napi_struct conversion was good too.

That only leaves the wireless bits :-)
-

OK, OK...I read you! :-)

I'll send some stuff your way tomorrow...

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

Thanks, Dave!  I'm building it right now....
-

From: Andrew Morton <akpm@linux-foundation.org>

I integrated and fixed up the IPG IP1000A driver, I'll work on
the Tehuti merge after dinner.

Thanks Andrew.

-

You could try that weird "post patches on the list" thing for review.

I dunno about sparc64, but IMO any networking work you do yourself and 
commit yourself should also be sent to the list for review.

	Jeff


-

From: Jeff Garzik <jeff@garzik.org>

I sent every single revision of the NAPI struct patch to netdev
Jeff.
-