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

Manual merge of arch/arm/Kconfig conflicts

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

into kernel.bkbits.net:/home/davem/sparc-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6

Passing sigcontext info in UREG_I2, as needed.
I only spotted this because I was diffing 2.4.x
and 2.6.x sparc64 code.
Signed-off-by: David S. Miller <davem@redhat.com>

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

into cantab.net:/home/src/ntfs-2.6

Just like s390 and ppc64.
Signed-off-by: David S. Miller <davem@redhat.com>

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

- U1copy_from_user needs PREAMBLE since it uses
  explicit ASI_BLK_AIUS references.
- Need to use EX_RETVAL() in U1memcpy.S
- U1memcpy.S can load one 64-bit word too
  many, passing the source buffer boundary
  and thus potentially causing exceptions.
Signed-off-by: David S. Miller <davem@redhat.com>

- Make it easier to maintain the Ultra-I vs. Ultra-III
  memcpy implementations.  Before you had to maintain
  3 different entire copies of the routines.
- Kill %asi register writing Ultra-I single memcpy loop
  for both user and kernel.  Was not worth it.
- Simplify exception detection and handling enormously.
Signed-off-by: David S. Miller <davem@redhat.com>

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

Instead of marking them as invalid, point them
at a dummy page.  This handles buggy third-party
bridges that erroneously prefetch sometimes.
Signed-off-by: David S. Miller <davem@redhat.com>

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

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

Manual merge of kernel/params.c clashes.

NFSv2/v3: Fix up a race in the case where the user presses ^C while a
   process is in the middle of setting up a posix lock. In case the
   server registered our lock, we need to make sure that it gets
   cleaned up during the resulting file close().
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VFS: Fix up documentation for the new locking interfaces.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VFS,CIFS,NLM,NFSv4: make filesystems directly responsible for calling
   posix_lock_file() if they need it. This fixes an NFS race whereby
   in case of a server reboot, the recovery thread could re-establish
   a lock that had just been freed.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VFS: get rid of the fl_notify, fl_insert, fl_remove fields from
   struct file_lock. They belong in the new lock_manager_operations
   structure.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

NLM: file_lock->fl_owner may live for longer than the pid of the
   original process that created it. Fix NFSv2/v3 client locking code
   to map file_lock->fl_owner into a unique 32-bit number or
   "pseudo-pid".
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

NLM: fix lockd to use the new posix locking callbacks.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

NFSv4 server: fix locking code to use new posix locking callbacks.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VFS: Enable filesystems and to hook certain functions for copying and
   freeing locks using the new struct file_lock_operations.

VFS: Enable lock managers (i.e. lockd) to hook functions for
   comparing lock ownership using the new struct
   lock_manager_operations.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VFS: Fix up posix_same_owner() so that it only uses the
   file_lock->fl_owner field when determining lock equality.

VFS: Fix up posix locking routines to use posix_same_owner() instead
   of rolling their own checks.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

He got the "privilege" of cleaning the driver up, and
to keep everybody happy, indent it sanely first.

This is the result of:

        indent -kr -i8 -bri0 -l255 BusLogic.c BusLogic.h

There's a misplaced check returning error for
hpt_minimum_revision(dev,8) == TRUE still there, making the previous
fixes useless for the early revision HPT cards.

This fixes it.

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

Here's a better table of acceptable commands, I've added some more
commands.  Should be pretty complete from the cd/dvd side now.

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

drivers/net/Kconfig:1749:warning: 'select' used by config symbol 'VIA_VELOCITY'

We renamed CONFIG_CRC16.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cciss uses /proc to hook into the SCSI subsystem.  If you do not build
/proc support into your kernel then you should also disable tape support in
the driver. 
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch updates the maintainers list for HP drivers.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch changes our read_ahead to 1024.  This has been shown to increase
performance.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes our usage of pdev->intr.  We were truncating it to an unchar.
 We were also reading it before calling pci_enable_device.  This patch fixes
both of those.  Thanks to Bjorn Helgaas for the patch.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Somehow I managed to get the wrong PCI ID in pci_ids.h.  3210 is the
correct PCI ID, 3211 is the subsystem ID.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes the vendor ID for our cciss based SATA controller due out
later this year and adds the new PCI ID to pci_ids.h.

Also changes DRIVER_NAME to HP CCISS.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes our cylinder calculations.  Without his fix the number of
cylinders maxes out at 65535.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes our output in /proc to display the logical volume sizes and
RAID levels correctly.  Without this patch RAID level will always be 0 and
size may be displayed as 0GB.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>