into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

smc91x.c: missing ifdef CONFIG_ISA around ISA-only code.
asm-arm/apm.h: ifdef CONFIG_APM breaks if APM is a module.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

* long constant in a.out.h
* missing cast to pointer in pgtable.h
* removed useless __chk_user_ptr() in get_user() and put_user() - with fixed
  typeof handling in sparse we are getting the check from
 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\
  anyway, so __chk_user_ptr() is redundant there.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

missing annotations in csum_partial_copy_from_user() on arm and ppc
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - a couple of PCI drivers made dependent on CONFIG_PCI
 - signed char fix in wavfront.c
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It used to create totally impossible resource trees in some
circumstances where it was asked to insert a conflicting
resource. We never noticed, because it wasn't used that much.

Make it return the proper error instead.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

ARM dependency and makefile fixes (ACKed by rmk)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

~0x0UL passed in u32 argument will do what the authors wanted, but it's
a hell of a silly way to spell ~0U on 32bit boxen and it generates warnings on
64bit boxen (we get correct value after truncation, but compiler doesn't
know that ;-)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

mpu401 ports are claimed by callers now
probe_mpu401() gets pointer to resulting struct resource
callers updated, a bunch of check_region() calls eliminated
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cmpci probing partially cleaned up in preparation to mpu401 fixes
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

probing cleaned up
leaks on failure exits fixed
ports handling mostly cleaned up (will be completed later, when we do mpu401)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

* ports for ad1848 are now claimed by callers
* ad1848_detect() gets pointer to struct resource in question
* ad1848_init() gets the same pointer and consumes it
* ports for mss are now claimed by callers (both config and ad1848 ones)
* probe_ms_sound() gets pointer to ad1848 ports
* attach_ms_sound() gets the same pointer and consumes both regions.
* callers updated.  That had killed a *lot* of check_region() and closed
  corresponding races.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

probing cleaned up, handling of ports mostly fixed.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

probing cleaned up, handling of ports mostly fixed.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

* probing cleaned up
* register ports claimed
* handling of other ports mostly fixed (will be completed later in series)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

probing cleaned up, claiming of ports mostly fixed (will be finished in
ad1848 patch later in series)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

* general cleanup of probing code
* claim codec ports
* sizeof(char *) had been used instead of intended sizeof(char[4]); it even
  worked on x86...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

moved request_region() to callers of sb_dsp_...()
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Dave Airlie <airlied@linux.ie>

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

into nuts.davemloft.net:/disk1/BK/sparc-2.6

When I moved sparc64 over to HZ==1000 this added some
problems to the udelay() handling.  Specifically, with
slower cpus we could now get underflows to zero for
things like udelay(1) due to the order of multiplies
and shifts.

Fix this, and move it out to arch/sparc64/lib/delay.c
so it is easier to tinker with this in the future and
also to optimize away one of the multiplies for the
constant delay case just like other platforms do.
Signed-off-by: David S. Miller <davem@davemloft.net>

CAPI skb freeing fix. On sending, the hardware/low-level
driver may free a skb on no error only. The application/core
side must take care otherwise.

Author: Carsten Paeth, Armin Schindler

Whether a brainfart or a mismerge, I inadvertently broke PA-RISC during
the fork_by_hand()/init_idle() consolidation.

The following patch repairs a compilebug/thinko pair, consisting of the
use of an undeclared variable cpunum, and not attempting fork_idle()
until after the check for IS_ERR(idle) reported by James Bottomley.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: David S. Miller <davem@redhat.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into suse.cz:/home/perex/bk/linux-sound/linux-sound

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux