into kroah.com:/home/greg/linux/BK/pci-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

Resending the patch I sent some time ago for b44.c that nukes the
2.4 compatibility cruft as well.

I'll do one for 2.4.23pre6 ASAP, hopefully being able sync the driver fully
with the one in 2.6 (free_netdev() etc.).

Too much copy&paste in a call to pci_unmap_single.

Contributed by Ken Zalewski.

1) Remove "#include <linux/version.h>" which was not needed and added
   bad extra compile dependencies.

2) Fix typo in module description.

3) Make card detection code cope with buggy SMC CIS entries.

Contributed by Josh Litherland, Donald Becker, and others.

contributed by "JaReK" and Donald Becker.

* Critical bug fix: under heavy Tx stress using ZEROCOPY or TSO, if we
  ran out of Tx descriptors, we didn't calculate for the context
  descritor used as the first of the ZEROCOPY/TSO send, nor do we clean
  up the context desriptor bits in the case where the send isn't going
  to fit, where we need to undo the mappings.  This bug was introduced
  with the 5.2.16 patch set which included a workaround for a hang
  on 82544 over PCI-X.  This workaround cause the check for no-Tx-
  rosource logic to change, and this bug slipped in.

Fix harmless 64bit warnings in defxx.c

Fix some harmless integer/pointer size mismatch warnings in hp100.c
on 64bit compiles

This marks some net drivers which are clearly not 64bit (judging from
the warnings) as !64BIT.

-Andi

removes a verry old debug line from the bpqethernet driver that
only fills logs.

fix for the probe function of the scc driver which now uses
an uninitialised scc struct for requesting an io region.

Finally got around to adding ethtool_ops to e100-3.0.x.  I found a bug
with get_eeprom() and it seems to work best if we add get_eeprom_len() to
the ops list.  Also moved check for offest + len < size into ethtool.c.

I was able to test [GS]EEPROM, PHYS_ID, GSTATS, GSTRINGS, and TEST, and
everything looks good.

Should I send same for 2.4?

pcnet_cs registers the network device too early.  The effect of this
is that the networking hotplug scripts are unable to bring the device
up automatically.

There are two issues:
- we were registering the net device before we finished setting up
  the device (eg, reading the MAC address.)
- we were using DEV_CONFIG_PENDING to block the net device "open"
  callback, and as we know the other methods may be called prior
  to open.

My only concern with this patch is that we set info->node.dev_name
after we register the net device, so use of cardctl during the
hotplug scripts may give unexpected results.  However, I am not
aware of anyone using cardctl to read the device name in network
hotplug scripts.

Please review and merge.  Thanks.

by converting to use alloc_etherdev.

This restores the changes to the dvb_net code done by
<shemminger@osdl.org>, which were wiped out by my last patchset.

flag (and order it on SMP), so that del_timer_sync() always sees the
timer either pending or running if it is active.

Cset exclude: mingo@elte.hu[torvalds]|ChangeSet|20031012025453|05000

into kernel.bkbits.net:/home/davem/net-2.5

My earlier change broke the if_ptr assumption used by SPPP drivers.
This makes sealevel driver do if_ptr like it used to.

In 2.6.0-test6, I put in a patch which fixed sealevel driver, but broke
all the other wan devices because it got rid of one level of indirection.

This puts back the indirection, and hopefully prevents others from
misreading it the same way. The SPPP drivers expect that
netdev->priv points to device local structure whose first element
is a pointer to the ppp device. 

Patch from Horms <horms@vergenet.net>

Since both the primay and the backup sync daemon can be started in a box
at a time, we must just check if the MASTER bit is set in the sync state.

This fixes the stack end detection properly, and verifies that the
stack content printing does not overflow into the next page even
partially.

This is required especially for x86 BIOSes that misalign the stack,
together with the page access debugging that unmaps unused kernel
pages to check for valid accesses.

Architectures with special needs (eg HPPA with stacks that grow up)
can override the kernel stack end test with __HAVE_ARCH_KSTACK_END
if they ever enable the anal slab debugging code.

This is the minimal change to make "mlockall()" not complain about
the occasional PROT_NONE area.

PROT_NONE is commonly used on x86-64, and is no reason to not lock
in the rest of the mappings into memory.

  
Can not be marked __init, must be marked __devinit or not at all.
If it is marked __init, then oops can happen by a user writing to the
"new_id" file from sysfs.

  
Can not be marked __init, must be marked __devinit or not at all.
If it is marked __init, then oops can happen by a user writing to the
"new_id" file from sysfs.

Can not be marked __init, must be marked __devinit or not at all.
If it is marked __init, then oops can happen by a user writing to the
"new_id" file from sysfs.

Sun-3: Add missing include (needed because of __attribute_used__ in
<linux/init.h>)

M68k: Export missing symbol csum_partial