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

into samba.org:/scratch/anton/tmp3

cpumask_up.h is broken. It tries to access the "mask" member although
that cpumask_t is an ulong on UP. This breaks archs which uses cpumask
functions even on UP such as s390.

We only support named initializers with one leval of naming, ie that

	.foo.bar = baz,

thing should go.  gcc-2.95 doesn't handle it (neither does sparse, I
think).

Replace such initializers with

	.foo = {
		.bar = baz,
	},

instead.

PA-RISC updates for 2.6.0-test5.

Contributions from Paul Bame, James Bottomley, Randolph Chung, Helge
Deller, Grant Grundler, LaMont Jones, Matthew Wilcox

Chas Williams fixed the compilation on SMP, so we can remove the Kconfig
annotation now and let people select it in the build again.

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

into kernel.crashing.org:/home/benh/kernels/for-linus-ppc

into kernel.crashing.org:/home/benh/kernels/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

This should fix all the remaining pci drivers which mark the pci device
ID tables as being discardable at run time.

This should fix all the AGP drivers.

pci_device_id tables can not and must not be marked discardable.  They
are used for as long as the driver is registered.

Use different var-names if they are non-static,
configure 4BRI like BRI cards, fixed new /proc entries,
inline declarations for common helper functions.

changed // comments to /* */

Main divas modules now may be build in-kernel.
4BRI cards are configured together with BRI cards.

fixed endianess errors in common code part.

Fixed internel list handling for modules built-in kernel.

Module now can be build without debug code, necessary
if the module is built-in the kernel.

Fixed spelling typos.

Fix application memory allocation, module locking,
building in-kernel, use new internal debug api.

Access to cards memory now uses macros to attach
to the correct memory area of the card.

The current IDE Power Management code I wrote has a race on wakeup when
the master device got resumed, it may take a request.  At this point, a
PM resume request to a slave device of the same hwgroup would clear
hwgroup->rq and cause an Oops when the master device request completes. 

This patch fixes it.  Due to the context in which PM resume requests are
sent, just not clearing hwgroup->rq for these is enough. 

I also removed a useless debug message in the PM code that was
actually misleading (people though it indicated a problem while it
didn't, it's really useless) and fix a typo in a comment.

This fixes a bug that happens when a request gets to the IDE layer for a
drive using ide-default (that is with no subdriver attached), like a
Power Management request.  In this case, the core will wait for the
device status to match drive->read_stat, but that field contains by
default a value that is not suitable for ATAPI devices.  This patch
fixes it.

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

This allows us to maintain quirks or capabilities on a per-port basis,
so we can handle buggy clones more effectively.

The dependencies for CONFIG_SERIAL_CORE / CONFIG_SERIAL_CORE_CONSOLE
were becoming very messy.  This cset converts the dependencies to
use "select" statements instead.

Since the driver model has transitioned away from using multi-level
device suspend/resume, we also drop the multi-level support from
the serial layer.

Update the 8250 and sa1100 drivers for this change.

into samba.org:/home/paulus/kernel/for-linus-ppc

Here's a patch to update the RxRPC driver. Most of it is CodingStyle fixes,
but it also includes a few miscellaneous bug fixes. stdint types are also
turned into C99 forms (eg: u32 -> uint32_t).

Benh saw some bugs where the queue would end up being in an invalid
state, and this could certainly explain one of them. We must not have a
stopped queue on the plug list, and blk_plug_device() right now will
happily plug a stopped queue.

We don't need to have it plugged either, blk_start_queue() will make
sure that request_fn gets run.

Code that includes seq_file.h uses a magic pointer "(void*)1"
to start a header seq_printf.

This patch adds a #define, so that people can start writing more
readable code.

This should fix the "ifconfig down ...  ifconfig up" problems some
people have seen.

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