Jeff,

I have adjusted several things in our queue after comments. Here is a summary 
of those changes against the original summary.

These changes are available through git.

Please pull:
  git pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream

(against netdev-2.6#upstream 699a71238856b19091503c671bac8abb1e3f9a3a)


Cheers,

Auke



Kok, Auke wrote:

Vasily Averin [off-list ref]
     e1000: IRQ resources cleanup
     e1000: e1000_probe resources cleanup
     e1000: ring buffers resources cleanup

Jesse Brandeburg [off-list ref]
     e1000: unify WoL capability detection code

all unchanged

     e1000: Add PCI ID 0x10a4 for our new 4-port PCI-Express device

This patch was not Acked but I assume no objections exist.

     ixgb: Set a constant blink rate for ixgb adapter identify (1sec on, 1sec off)

unchanged

     ixgb: Cache-align all TX components of the adapter struct.

modified per comments to include "_in_smp"

     ixgb: Add buffer_info and test like e1000 has.

unchanged

Christoph Hellwig [off-list ref]
     e1000: clean up skb allocation code, patch submitted by Christoph

Changed topic as attribution is already in the patch correctly

Jeff Kirsher [off-list ref]
     e1000: Deprecate mii-tool SIOCMIIREG ioctl

Dropped patch.

Auke Kok [off-list ref]
     e1000: Whitespace cleanup, cosmetic changes
     e1000: error out if we cannot enable PCI device on resume
     e1000: remove unused part_num reading code
     e1000: Use module param array code
     e1000: Increment driver version to 7.2.7-k2
     e100: Convert e100 to use netdev_alloc_skb().

all unchanged

     e100: reduce time under spinlock

Dropped patch.

     e100: remove skb->dev assignment
     e100: increment version to 3.5.16-k2
     ixgb: Convert dev_alloc_skb to netdev_alloc_skb.
     ixgb: convert dev->priv to netdev_priv(dev).
     ixgb: recalculate after how many descriptors to wake the queue
     ixgb: remove skb->dev assignment
     ixgb: Increment version to 1.0.112-k2

Linas Vepstas [off-list ref]
     e100: fix error recovery
     ixgb: Add PCI Error recovery callbacks

all unchanged

Cheers,

Auke

---
  drivers/net/e100.c                |    8
  drivers/net/e1000/e1000.h         |    6
  drivers/net/e1000/e1000_ethtool.c |  219 ++++---
  drivers/net/e1000/e1000_hw.c      | 1059 ++++++++++++++++++-------------------
  drivers/net/e1000/e1000_hw.h      |   26
  drivers/net/e1000/e1000_main.c    |  145 +++--
  drivers/net/e1000/e1000_param.c   |  161 +++--
  drivers/net/ixgb/ixgb.h           |    5
  drivers/net/ixgb/ixgb_ethtool.c   |    6
  drivers/net/ixgb/ixgb_main.c      |  140 ++++-
  10 files changed, 979 insertions(+), 796 deletions(-)