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

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

This contains the following changes:

a) changes from Intel to support the new microcode data format
   (backward compatible of course)

b) changes from me to remove the no longer needed features of the driver,
   namely we don't need to keep a copy of applied microcode in kernel
   memory.

   This feature was hardly useful in the days of regular devfs
   /dev/cpu/microcode file and now it is completely useless so I removed
   it (after taking into account all the feedback on linux-kernel I
   received since the announcement of the intention to do this)

These are rather critical because otherwise we can't really say Linux
fully supports the very latest Intel cpus (which require microcode in
the new format).

Having the number-of-threads value easily available turns out to be very
important for procps performance.

The /proc/*/stat thing getting reused has been zero since the 2.2.xx
days, and was the seldom-used timeout value before that.

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

into kroah.com:/home/greg/linux/BK/i2c-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.

It's quite easy to accidentally miss this option out. I think it makes
sense to default it to yes if HID support is enabled.

There's a small issue with drivers/usb/serial/keyspan_usa90msg.h

The definition for MSR_RI conflicts with some PowerPC CPU definition
(MSR is the Machine State Register on PPC and processor.h defines
MSR_RI globally). This definition doesn't seem to be used in any .c
in drivers/usr/serial though, so I beleive it could be easily renamed
to something a bit less prone to conflict ;) Changing the PPC definition
would be a lot nastier.

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

This patch primarily fixes PM-related bugs in the OHCI driver.

It gets rid of some flags that duplicated state between usbcore
and the HCD.  The duplication wasn't correct, and wasn't tested
correctly ... this fixes both issues.  So now the driver avoids
writing to hardware when it's suspended (as required by older
PowerBook hardware) or halted, and treats all non-running states
the same (as required by all hardware).

This includes the last generic parts of a patch sent a while back
by Benjamin Herrenschmidt, which weren't at that time testable on a
x86 kernel because the generic PM code was in flux (and broken).
There may still be some PMAC-specific issues to resolve.

With this patch, and a device_resume() deadlock fix, I've seen
OHCI suspend/resume work on hardware it's not worked on since the
PM changes started to merge into the 2.6.0-test kernels.

This fixes some bugs observed in the EHCI code:

  - Byte-order confusion caused the wrong address to be set
    on big-endian hardware (reported last week on PPC and
    SPARC).   That bug's been there for about a year, with
    no problem reports ... hmm.

  - Used the wrong bitmask to determine max packet size
    for interrupt transfers, so they were limited to 1023
    bytes (not 1024 bytes) at high speed.

  - Because those two problems related to the masking,
    I sanity checked it and moved more of byteswapping
    to compile time.

  - Removes some oopsing in the (debug) periodic schedule
    dump, seen with patches that add more interesting
    behaviors (which folk are finally trying...).

  - Removed some now-pointless <linux/version.h> usage

For some reason, they do not like the reset_config calls anymore.

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.