into ozlabs.austin.ibm.com:/data/anton/for-linus-ppc64

Apply on top of 2.6.0-test5-bk1 + Stephen sdla patches. Compiles fine.


free_netdev() patrol.


 drivers/net/wan/sdla.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

One more patch, found this in testing
 -- need to delete device from list when unregistered
because of callback.

Since dlci device is a pseudo device built on top of sdla, change it to
handle unregister events and delete itself.

Change the locking for the dlci device list and registration.
- use RTNL instead of a private lock (needed for net notifier in next patch).
- reorder the checks in the dlci_add to avoid complicated unwinds
- use dev->destructor to free
- hold RTNL around deassoc to protect callback from races

The sdla and dlci drivers have a callback interface which only stores a name
in a table, but doesn't do anything useful. Looks like an interface which has
lost it's usefulness and can be safely removed.

Tested on 2.6.0-test5 by exercising the higher layer (dlci) without real hardware.

Patch against 2.60-test5 to move sdla driver out of Space.c for initialization
in non-module case.  Since this driver doesn't come up until the device has
been configured with an ioctl (set_config); there is no way it can have
startup order problems.

The cosa driver definition of ioctl's either conflicts or was not picked
up in the last round of _IOR redefinition (on 2.6.0-test5).

The following makes it build, have no idea if it still works
on real hardware.

This patch to 2.6.0-test5 removes the #warning in tokenring/olympic.c
and improves error handling in the probe function.

* misc whitespace cleanup, changelog

* Add PHY master/slave #define override to address link issues
  with 82541/7 (rev2) against some low-end switches.  Forcing
  master will improve the time-to-link against these switches.

* Move static table from hw.h to hw.c to avoid creating a copy
  of table everytime hw.h is included.in .c.

* clean up error return code propagation and eliminate redundant
  DEBUGOUT statements.

* Consolidate code and make function out of setting media type.

* Add ethtool flow control support

* Bug fix: read the correct bit from the EEPROM that controls the
  initial setting for WoL after a reset.

* Turn off ASF support on fiber nics.  Wasn't tested and isn't
  known to work, so disable before someone hurts themselves.

* Bug fix: 82544 hang with PCI-X: if outgoing Tx buffers terminate
  within evenly-aligned dwords, and the device is sharing the bus
  segment with another PCI-X device, 82544 can hang the bus on a
  split-completion transaction.  Fix is to split buffer into two
  buffers with the first one not terminating within evenly-aligned
  dword address, and the second one being 4-bytes, which goes as a
  non-split-conpletion PCI-X transaction.
* 8254x controllers that support TSO do an internal calculation to
  make sure there is enough FIFO space to handle the overhead
  of each TSO segment before DMA'ing TSO data from host memory.  The
  internal calculation is dependent on the mss of the TSO (defines
  the number of segments), but the reserved space is a constant, so
  we need to adjust the maximum size of each buffer queued to the
  hardware to hold the equation and not overrun the FIFO.  This is
  per TSO because the mss can change from one send to the next.

* Added 82545 (rev3), 82546 (rev3), and 82541/7 (rev2) support
	- new device IDs
	- internal SERDES support for 82545/6 (rev3)
	- don't apply MMRBC workaround for 82545/6 (rev3)
	- don't use IO mapping for reset for 82545/6 (rev3)

This also required some other functions and variables to be marked as 
__devinit

Also change the #define functions into inline functions to help
catch any future paramater mis-matches.

And clean up a few minor style issue...

> > These either need to be marked __devinit and make "new_id" dependant on
> > CONFIG_HOTPLUG

Patch below moves all the new_id code under CONFIG_HOTPLUG.  Tested
with both CONFIG_HOTPLUG enabled and disabled.  No significant code
changes, merely code moving, and in 2 cases, stub functions added.

into kroah.com:/home/linux/BK/pci-2.5

Thish fixes Suparna's fsx and aio-stress and Dave Olien's concurrent
mke2fs problems.

It moves the hash adding into as_add_request.  This fixes a small bug
where a request could be added to the merge hash after being put on the
dispatch list. 

It also moves responsibility for handling rbtree aliases (requests with
the same start sector) out of as_add_arq_rb and into its caller.  This
cleans up a layering problem which was causing the state machine to go
silly.  Now instead of forcing the alias out onto the dispatch list, we
chain the new request behind it, and they get sorted out at dispatch
time.

The PS/2 ESDI driver has some problems: a couple of typos on the modular
side and misuse of module_init():