On Sat, Nov 05, 2005 at 04:24:21PM -0500, Jeff Garzik wrote:
> John W. Linville wrote:
> >I thought you might appreciate a little offload of some of your netdev
> >merging chores. I don't think there is anything controversial here.
>
> Thanks, appreciated.
>
> I already had some of this stuff in netdev-2.6.git, so, how to proceed
> from here?
I rebased on your latest netdev-2.6. I dropped the ones you had
already merged, and the "natsemi: Option to use MII port with no
PHY" patch. I merged the others, plus the airo.h one from Adrian
since it seemed reasonable as well.
The pull request follows, w/ the patch ommitted because of its size
(due to bnx2 firmware update). I can provide that under separate
cover if desired.
Thanks,
John
---
The following changes since commit 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab:
Linus Torvalds:
Merge branch 'upstream-linus' of
master.kernel.org:/.../jgarzik/netdev-2.6
are found in the git repository at:
git://git.tuxdriver.com/git/netdev-jwl.git
Adrian Bunk:
drivers/net/ixgb/: make some code static
drivers/net/e1000/: possible cleanups
drivers/net/hamradio/dmascc.c: remove dmascc_setup()
airo.c/airo_cs.c: correct prototypes
Daniel Drake:
prism54: Remove redundant assignment
Michael Chan:
bnx2: add 5708 support
bnx2: update firmware for 5708
bnx2: update nvram code for 5708
bnx2: update firmware handshake for 5708
bnx2: refine bnx2_poll
bnx2: update version and minor fixes
drivers/net/bnx2.c | 468 +++
drivers/net/bnx2.h | 119 +
drivers/net/bnx2_fw.h | 4055 ++++++++++++++++++-----------
drivers/net/e1000/e1000_ethtool.c | 2
drivers/net/e1000/e1000_hw.c | 101 +
drivers/net/e1000/e1000_hw.h | 42
drivers/net/e1000/e1000_main.c | 31
drivers/net/hamradio/dmascc.c | 10
drivers/net/ixgb/ixgb_ethtool.c | 2
drivers/net/ixgb/ixgb_hw.c | 31
drivers/net/ixgb/ixgb_hw.h | 17
drivers/net/ixgb/ixgb_main.c | 2
drivers/net/wireless/airo.c | 2
drivers/net/wireless/airo.h | 9
drivers/net/wireless/airo_cs.c | 6
drivers/net/wireless/prism54/islpci_eth.c | 1
include/linux/ethtool.h | 3
include/linux/pci_ids.h | 2
18 files changed, 3160 insertions(+), 1743 deletions(-)
create mode 100644 drivers/net/wireless/airo.h
--
John W. Linville
[EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
