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

Remove unneeded function declarations and correct /proc-directory name
for > 1 pcmcia_socket_class devices.

here's the compile fix for this breakage which appears if CONFIG_ACPI &&
!(CONFIG_CPU_FREQ_TABLE || CONFIG_CPU_FREQ_TABLE_MODULE).

This morning's fix for elv_former_request() is causing oopses all over the
place in the IO scheduler.

Jens, remember that I did try that fix a while ago, and the same happened.

I believe it has exposed a new problem at the __make_request/attempt_front_merge
level: if attempt_front_merge() actually succeeds, the wrong request gets freed
up in elv_merged_request().

It may be best to back this change out until it can be fixed up for real.

into home.transmeta.com:/home/torvalds/v2.5/linux

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.make

modpost did not warn on symbols which are exported but not defined
in the current module, but it should.

Also, fix a compile time warning, and have bk ignore *.mod.c files.

into home.transmeta.com:/home/torvalds/v2.5/linux

 - pci_disable_device() added in rr_remove_one() to balance
   pci_enable_device() in rr_init_one()
 - rr_timer() and rr_close() are leaking pci_map'ed memory: make them
   use rr_raz_{rx/tx}
 - error exiting path in rr_open() was balancing pci_alloc_consistent()
   with kfree().

The new reset function only waits up to 0.1 ms for the reset to complete,
instead of 10 ms. However, it introduces the use of a forced reset flag if
a chip doesn't seem cooperative. This fixes cases where until now only
reloading the driver or even rebooting the machine would bring the chip
back.

Fix the following bugs:
- after a watchdog timeout (still a common thing with the Rhine), the
  driver will fall back to half-duplex, ignoring the auto-negotiation
  results, killing performance completely until the driver is reloaded;
  fixed by clearing full_duplex in init_registers()
- driver considers only 0x200 for full-duplex option; now 0x220
- duplex code used dev->name before it's initialized; code section moved

The full_duplex and force_media related code is quite a mess, but this
minimal fix will make the most annoying problems go away. Looking at some
other code (e.g. mii.c) it seems to me the interaction between user force,
autoneg results and full_duplex/force_media is amazingly complex, so I'll
leave it at this for now.

The Tx underrun handling in the current driver is broken. The details have
been explained in a posting "VIA Rhine 1.15exp1, patch for
testing/discussion" a couple of months ago.

- nuke mii_status_bits
- move clear_tally_counters() up so it can get inlined (pointed out by
  Luca Barbieri)
- rename via_restart_tx() -> via_rhine_restart_tx()

into redhat.com:/garz/repo/net-drivers-2.5

Merge in fixes from version 0.6.5 of the CIFS VFS.  Greatly improved performance including improved distributed caching support and support for readpages and larger read sizes. Cache data now flushed properly at file close time. Socket and memory leak fixed.  Fix two oops. Fix error logging and made more consistent.  Generic sendfile added.

The deprecated /proc/cpufreq interface can easily live outside the
cpufreq core now.

The CPU frequency table helpers can easily be modularized --
especially as they are not needed on all architectures, or for
all drivers (even on x86 -- see longrun and gx-suspmod)

I added this comment but the line it refers to is long gone.

The interrupt printout in /proc/stat doesnt make sense on many ppc64
boxes because we remap interrupts. Also, with enough active interrupt
sources /proc/stat might get much bigger than a page which results
in memory corruption.

This patch removes the {un}register_ss_entry/pcmcia_{un}register_socket
calls, and replaces them with generic driver-model-compatible functions.

Also, update the CodingStyle of these cs.c functions to what's recommended
in the Linux kernel.

A new device_class "pcmcia_socket_class" is introduced for PCMCIA and
CardBus sockets.  All socket drivers I could find are updated so that
they register a driver, and -if necessary- the "platform"/legacy device.
This will allow for a cleanup of pcmcia_{un}register_socket() /
{un}register_ss_entry() as well as reflect the parent for pcmcia_bus
devices.

Russell King allowed me to break sa1100_generic pcmcia support for the
time being - so drop that part of the patch for the moment.

into home.transmeta.com:/home/torvalds/v2.5/linux

into samba.org:/scratch/anton/sfr

This is the generic part of the patch and the architecture specific parts
I have been asked to forward directly to you.

There is an unused variable, `int maxlen', in net/sunrpc/clnt.c ::
rpc_setup_pipedir().