From:  Stephen Hemminger <shemminger@osdl.org>

  Compile errors in the pcmcia/tcic driver if PCMCIA_DEBUG is defined.
  Looks like simple debug code bitrot, this fixes it.

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

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

At the moment the aty128fb and matroxfb frame buffer drivers don't
compile on PPC.  In both cases the error is pretty trivial.  This
patch is the minimum change to fix the problems.

The _IOR() type problem fix in aty128fb.c depends on the fact that the
size of a pointer is the same as "size_t", so we don't have to use
_IOR_BAD() to keep the ioctl number the same.

Noted by Al Viro: if no handler exists (and we have IRQ_INPROGRESS set
because of an earlier irq that got through), synchronize_irq() will
end up waiting forever.

This fixes two serious bugs in the futex code.

One is a race condition which results in list corruption when
FUTEX_REQUEUE is used.  It is due to the split locks change introduced
in 2.6.0-test6, and oopses when triggered.

The other is a security hole.  A program can use FUTEX_FD to create
futexes on mms or inodes which don't reference them, and when those
structures are reused by a different mm or inode, the addresses match.
The effect is that a malicious or flawed program can steal wakeups from
completely unrelated tasks, causing them to block (or worse if they are
counting on the token passing property).

These are the specific changes:

    1. Each futex_q retains a reference to its key mm or inode.

    2. The condition for a futex_q to indicate that it's woken can usually
       be interrogated lock-free.

    3. futex_wait calls the hash function once instead of three times,
       and usually takes the per-bucket lock once too.

    4. When a futex is woken, the per-bucket lock is not usually taken,
       so that's one less cache line transfer during heavy SMP futex use.

    5. The wait condition and barriers in futex_wait are simpler.

    5. FUTEX_REQUEUE is fixed.  The per-bucket lock juggling is done
       in such a way that there are no race conditions against the tests
       for whether a futex is woken.


This patch is an combination of patches previously sent to the list.  An
equivalent patch has been in Andrew Morton's tree for a while, with no
failure reports.  Also I have been running it on my own SMP box for a
while.  Conversely, we have received an oops report for the 2.6.0-test6
code, so the fix is needed.

1. send_sigio() sends to a specific thread, _not_ a process.
   (It can also send to a process group, but that's not relevant here).
   This is useful, and should stay as it is.

   Therefore it makes _no sense_ to call f_setown() with current->tgid.
   Presently the kernel is inconsistent about it, with some places using
   current->pid and some others using current->tgid.

   This patch changes f_setown() calls to use current->pid.

2. In some places, f_setown() is called not at the user's direct request,
   but as a side effect of another function.  Specifically: dnotify and
   file leases.

   It is good to allow a program the flexibility to specify a different
   pid than the default, using F_SETOWN.  Presently they can do this after
   the dnotify or lease call, but there is a small time window when it
   will be temporarily set to current->tgid (which as pointed out above,
   is not always right).

   The window is avoidable if the program can use F_SETOWN prior to the
   dnotify or lease call.  This is exactly what the "force" argument to
   f_setown() is for, and this patch changes it to zero in those callers.

   This change is not likely to affect any existing programs.

Enable NFS_DIRECTIO support now that it has been fixed...

  - Support synchronous directio only. Defer asynchronous directio until
    it can be made safe.
  - If read/write exits due to an error, return number of bytes read/written
    prior to occurrence of the error.
  - Make sure we mark read pages as dirty in case we're doing zero-copy tricks.
    Export set_page_dirty_lock() for use by NFS directio.
  - Ensure we revalidate stale attribute info.

Add support for synchronous calls to the NFSv3/v4 COMMIT functions.

It is in any case no longer needed.

  - Use correct credentials in the NFSv4 synchronous read/write code.
  - Return correct number of read bytes in the NFSv4 synchronous read code.
  - SunRPC XDR fix: NFSv4 reads when caller requests a non-word aligned
    number of bytes was broken.

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

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

This just disables some drivers which are clearly not 64bit clean from
the configuration for CONFIG_64BIT hosts.

Partly from Arnd Bergmann.

From Arnd Bergmann.

Various APIC/ACPI fixes for x86-64. This brings us closer to working
out of the box on the now popular VIA and NVidia Nforce3 based Athlon64
and Opteron boards. To be really good we would need more ACPI changes
(still waiting for that to be all merged through the usual channels).

With this we mostly work with acpi=off at least.

Also it syncs us up with bugfixes done in 2.4.

 - Disable IO-APIC by default on non SMP VIA/NVidia boards.  This is a
   bit of a hack, but needed to work around ACPI bugs.  Can be
   overwriten with "apic". 
 - Add acpi=ht, meaning run ACPI boot setup, but do not enable the
   interpreter.  Same as i386.
 - Stop MADT parsing early when local APIC or IO-APIC are disabled
 - Add more option parsing early enough to actually change the boot
   process
 - Update documentation for command line options

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

Patch from Bjorn Helgaas

Intel 870 firmware reports an extra zero-length IO port range, which
is bogus, as far as I can tell.  Ignore it.

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

Patch from Yves Rutschle.

This cset allows LART to build again.

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

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

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

This allows PPC to insert resource descriptors later on after boot.

Mostly from Sam Ravnborg <sam@ravnborg.org>.

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

into shaggy.austin.ibm.com:/home/shaggy/bk/jfs-2.5

into kernel.bkbits.net:/home/mochel/linux-2.5-power

into kernel.bkbits.net:/home/mochel/linux-2.5-core

From Ethan Benson <erbenson@alaska.net>.

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