[PATCH net-next 0/8] bnx2x: move bnx2x to separate folder and divide to files

[PATCH net-next 0/8] bnx2x: move bnx2x to separate folder and divide to files

[Dmitry Kravkov]

resubmit the series with fixes for git-apply. Thanks
 
Hi,
Please consider applying following patch series to the net-next.
The series creates separate folder for bxn2x files and divides
bnx2x_main file into several logical parts:
	bnx2x_cmn.[ch] - common functionality for PF and upcoming 
			 VF drivers
	bnx2x_stat.[ch] - statistics handling
	ethtool.c - ethtool related function and structs

After applying this series, integration of latest bnx2x patches
from net-2.6 which include fixes for statistics handling can't
be performed in a "automatic" way then i can suggest to re-submitting
these two patches.

Dmitry
---

Re: [PATCH net-next 0/8] bnx2x: move bnx2x to separate folder and divide to files

[David Miller]

From: "Dmitry Kravkov" <dmitry@broadcom.com>
Date: Wed, 28 Jul 2010 01:40:47 +0300

> resubmit the series with fixes for git-apply. Thanks

All applied, thanks.

Re: [PATCH net-next 0/8] bnx2x: move bnx2x to separate folder and divide to files

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Tue, 27 Jul 2010 20:36:40 -0700 (PDT)

> From: "Dmitry Kravkov" <dmitry@broadcom.com>
> Date: Wed, 28 Jul 2010 01:40:47 +0300
> 
>> resubmit the series with fixes for git-apply. Thanks
> 
> All applied, thanks.

Ummm, so what in the world did you think was going to happen
the next time I try to merge net-2.6 into net-next-2.6?

Any clue what might happen?

Any idea?

Since you not only moved the driver into a new directory,
but also moved functions all over the damn place into new
files too, the bnx2x bug fixes in net-2.6 have to be applied
by hand by me during the merge, bit by bit.

This is one of the millions of reasons I absolutely detest multi-file
drivers, people move crap around, patches from one tree can't easily
be munged into another, etc.

If it's too big to fit in one file, your driver is too damn bloated.
End of story.  Put the thing into one file under drivers/net and
simplify _everyones_ life.

I'm fixing this merge mess up, but I'm very not happy about how
you guys staged this sequence of events.