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

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

Sorry about that Linus.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

This creates compat_uptr_t (to represent a user mode pointer passed to
the kernel other than as a syscall parameter) and compat_ptr() to
convert it to a kernel pointer. 

This fixes a couple of bugs in s390x (where the conversion of pointers
actually does something). 

Convert remaining register_pcmcia_driver users to use the new
pcmcia_register_driver interfaces.

swap.h is basically the header for MM internals instead of the
public API (mm_internal.h would have been a better name..).  Stop
including it in mm.h - this only needs moving one function that
should be in swap.h anyway to the right place and fixing up a bunch
of places using it.

Always pass the input/ prefix to input_register_minor instead of using
the first argument to devfs_register

All devfs_mk_symlink arguments except the from and to strings are
unused.  Bring the prototype in shape.

It was good to see the syscall return value types being fixed but still
some cases are missing.  I attach a patch which fixes at least those
which cause problems to me in the moment.

- uninitialised var warning in pci_update_resource

- fix jiffy comparison type warnings in parport_pc.c

parport_register_port() does spin_lock_irq() then spin_unlock().

This causes the IDE code to mysteriously go BUG_ON(irqs_disabled()) in a
later initcall.

Three varients of the NFSD system call use __kernel_* types in defining
the arg, which is bad: these types should not be exposed to userspace.

Particularly as __kernel_dev_t might change soon.

Two of the varients, getfh and uidmap, are not implemented, getfh is
deprecated and uidmap never was and never will be implemented.

This patch removes (almost) all trace of these two varients, including
all the 32bit-compat system call translators for various 64bit
platforms.

The third varient that uses __kernel_* types, export, is not so easy to
deal with, so it will be kept for later.

Fix the IDE hang people see with 2.5.65-bk

From Dominik Brodowski <linux@brodo.de>

PC9800 uses the ISAPnP protocol but on CBUS not ISA bus. The
current patch is below. I'm wondering if there is a cleaner way we
should do this ?

So its now two options

I missed the CREDITS change before

[From Osamu Tomita]

This fixes one of the long standing IDE hangs on SMP. If you
get an error we disable the IRQ, unfortunately we may be in
the IRQ handler

This change gets us back working but does introduce a small
potential race I need to investigate further and fix up in
a nicer fashion.

IDE should do error handling in a seperate context (as SCSI
does) but not for 2.6.

both ways, but anal compilers will warn about using identifiers that
have never been defined in preprocessor expression statements.

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

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