This panic was reported to lkml by Anton Altaparmakov.  The code added to
partitions/check.c to add partitions to driverfs requires preparation by the
calling entity.  There's a NULL pointer check to see if the calling entity
actually did the preparation, but IDE forgets to clear the area it kmalloc's
for struct genhd so the pointer contains junk.

The fix is just to clear the struct genhd before IDE uses it.

- Change fs/ntfs/super.c::ntfs_statfs() to not rely on BKL by moving
  the locking out of super.c::get_nr_free_mft_records() and taking and
  dropping the mftbmp_lock rw_semaphore in ntfs_statfs() itself.
- Bring attribute run list merging code (fs/ntfs/attrib.c) in sync with
  current userspace ntfs library code. This means that if a merge
  fails the original run lists are always left unmodified instead of
  being silently corrupted.
- Misc typo fixes.

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

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

to user space. Convert to standard clock_t.

Make dcache filesystems export directory entry types
to readdir.

For PA-RISC, we need find_vma_prev to return `prev', even if vma is NULL.
Our stack is at the top of memory, growing upwards, so when we page fault
we need to see prev.  For added bonus points, the code becomes simpler,
less indented, shorter and (for me, anyway) easier to understand.  The
code is well-tested, even on x86.  For PA and ia64 this code is called in
the page fault handler path so it is exercised frequently.

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

into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5

into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5

Fix APM that got broken by getting rid of "struct tms" and clock_t.

Doug Gilbert and James Bottomley hassled me all through KernelSummit &
OLS to explain about softirqs, tasklets and bottom halves.  In the end,
it was easier to write the code myself.  Thanks to James for pointing
out that the pointer handling in my original code was completely broken
and helping me debug.

I've booted this patch on a 4-way system at OSDL with two Adaptec SCSI
cards.  I haven't tried stressing it (not quite sure which discs I can
use ;-), and I don't understand the locking in the scsi subsystem at all.

The main effect of applying this patch is that scsi_softirq() [was
scsi_tasklet_func, and before that scsi_bottom_half_handler()] can now be
run on multiple CPUs at the same time.  We _seem_ to do enough locking
elsewhere in the SCSI stack that this is safe.  But someone who really
understands the SCSI stack should audit this.

This work shows up a hole in the current softirq API -- there's no support
for unregistering a softirq (close_softirq or similar).  We should do
this in scsi_exit -- make sure no softirqs are running while we unload.
This probably isn't a problem in practice, but it'd be nice to fix it.

Stop using "struct tms" internally - always use timer ticks (or one of
the sane timeval/timespec types) instead.

Explicitly convert to clock_t when copying to user space for the old
broken interfaces that still use "clock_t".

Clean up and unify jiffies<->timeval conversion.

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

into cantab.net:/usr/src/tng-2.0.13

into cantab.net:/usr/src/tng-2.0.12

into cantab.net:/usr/src/tng-2.0.11

   This fixes an off by one error in getcolreg/setcolreg in matroxfb's
secondary head driver.

  When James converted all drivers to unified do_install_cmap(), he
blindly changed also matroxfb, which happily uses fbcon.currcon == -1.
This caused memory corruption because of memory before fb_display[]
array was overwritten.

  Default do_install_cmap() also installed invalid default color map in
some matroxfb resolutions.  Not all world have >= 4bpp.

Disable volume control irq on maestro module unload.

  Fix the usage of pci_map and pci_unmap in the driver, mainly on 0 length cmds
inia100.c:
  Fix the usage of pci_map and pci_unmap in the driver, fix use on 0 length cmds

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

  Oops, global variable defined in two different files.  One needed extern.

- Remove nr_mft_bits and the now superfluous union with nr_mft_records
  from ntfs_volume structure.
- Remove nr_lcn_bits and the now superfluous union with nr_clusters
  from ntfs_volume structure.
- Use iget5_locked() and friends instead of conventional iget(). Wrap
  the call in fs/ntfs/inode.c::ntfs_iget() and update callers of iget()
  to use ntfs_iget(). Leave only one iget() call at mount time so we
  don't need an ntfs_iget_mount().
- Change fs/ntfs/inode.c::ntfs_new_extent_inode() to take mft_no as an
  additional argument.

After a machine check that is handled by a debugger or by sending a
signal to a user task, set MSR.RI again.