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

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

Maurice van der Stee noted that he got an oops on a HPFS filesystem when
saving an edited file..

  <stares at the code>
  <blinks>
  <wonders whereTF do we assign hpfs1_i and hpfs2_i if both inodes are non-NULL>
  <finds the patch in question>
  <stares at jgarzik>

This fixes it.  That, BTW, means that *nobody* had ever tried to use
hpfs r/w since 2.5.3-pre3.

From Hans Ulrich Niedermann

All sound documentation with the exception of the OSS rme96xx
documentation is under Documentation/sound/{alsa,oss}.

Move the rme966xx docs, and fix the Kconfig comments

P4 oprofile needs cpu_sibling_map and smp_num_siblings, the later
was not exported

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

The pdflush kernel threads can lead to an unbounded chain of thread-creations
which can overflow the kernel stacks because we didn't uses to reset
the stack on kernel thread-creation.  We do now.

Reported by Andreas Schwab, tracked down with help from Keith Owens.

This patch changes the I/O SAPIC code to cache the low 32 bits of the mask
word in kernel memory.  This greatly speeds up mask_irq() and unmask_irq().

Normally, these operations are not on the speed-critical path of the
kernel but with certain devices drivers (including users-level device-
drivers) they can become performance-critical.

        - fix bug in pfm_unload(), not allowed when not on correct CPU for
          system-wide
        - some perf/cleanup in overflow handler
        - fix reset_pmds to be on a per PMD basis on counter overflow rather
          than global
        - remove timing debug code on messages
        - no kernel info leak on PFM_END_MSG
        - remove double-store on reg_flags for pfm_write_pmcs, pfm_write_pmds
        - on restart reset_pmds is 0 by default
        - cleanup useless macros
        - cleanup some debug prints
        - added ability to remove debug code
        - streamlined sys_perfmonctl(), pfm_read_pmds(), pfm_write_*()
        - added current->tgid to default format sample header by using one
          reserved field

The problem was that IDE-disks on machines with IDE harddisks,
memory above 4GB and no hardware I/O TLB would go BUG_ON() in
blk_queue_bounce_limit() because the IDE-controller could only
address 4GB of memory and that was much less than BLK_BOUNCE_ISA
(which is equal to ISA_DMA_THRESHOLD).  Note that the problem does
NOT trigger with CD-ROMs, which always uses the software I/O TLB
(and hence bounce-buffers) on such machines.

The best fix seems to be to simply lower ISA_DMA_THRESHOLD to 4GB-1 since
that will ensure that the IDE block layer allocates memory with GFP_DMA,
which will minimize bounce buffering.

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

Allow command line partitioning for use with Integrator flash.

Tighten AFS partition checks:
- check footer checksum.
- check that the image name is NUL terminated.
- return error from mtd->read intact.
This prevents us finding bogus AFS partitions.

This makes it possible for people like me with a small-mem G5 to enable
the DART.  I see two reasons for wanting to do so:

1. To debug/test DART/iommu code itself (small audience, including
   myself).
2. To debug drivers on small-mem machines, since bad pci_map*() usage will
   be punished (possibly larger audience).

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

kNFSd needs it.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

This patch fixes a bug which could cause do_softirq() to be called
at the wrong time (from do_IRQ()) or without pre-emption protection.

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

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

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

of redundancy, and to help prevent future errors.

This makes GregKH happy by removing the device name from the
device.bus_id field (and replacing it with a "name" sysfs attribute).

It also renames the parent device from "vdevice" to "vio", making the
/sys/bus and /sys/devices hierarchies consistent.

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

Add documentation for the above two functions.  Allow a NULL name to
be passed to amba_request_regions.  In this case, we use the driver's
name associated with the device.

This allows the decompressor to automatically detect the geometry of
the cache while booting to ensure correct behaviour over a wider
number of ARM CPUs.

This optimises the underlying string-long read function for little
endian platforms.

This gives greater information on the cause of the bad IRQ, allowing
the cause to be more effectively traced.

The old sysctl PM interface has been replaced by the driver models
interface.  This has been gone for a while in the -rmk tree and no
one complained, so there's no point keeping it around.

- use dev_dbg for device-centric debugging messages
- use pr_debug for general debugging messages
- use dmapools instead of pcipools
- use NULL rather than 0 for NULL pointers
- use enum dma_data_direction rather than int
- use DMA_* direction definitions rather than PCI_DMA_*
- only check for sane DMA direction on mapping functions, but
  check that DMA direction matches when unmapping/syncing.