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

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

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

Stephane made some measurements on the access-pattern of the cpuinfo_ia64
members and based on those results, this patch reorganizes the structure
for better cache-line sharing.

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

sata_sil:  it's a widely deployed chipset.  Now that we've fixed it, let
users use it.

sata_via:  Disk detection via SATA phy registers appear problematic. 
Until that problem is identified and fixed, used the old PATA detection 
code -- that was used in 2.6.4 -- instead.

I'd assumed that vcs_remove_devfs() could not possibly take console_sem(). 
Seems I was wrong.

x86-64 needs this (obvious) patch, due to the rename.

into foobazco.org:/sources/2.5-sparc-todave

into foobazco.org:/sources/2.5-sparc-todave

Semaphores use 24-bit atomics, not 32.  Using the wrong initializer
causes immediate deadlock under SMP, and incorrect results under UP.

From: David Mosberger <davidm@napali.hpl.hp.com>

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

We can't build floppy.o on ia64, so why bother asking?

From: Jens Axboe <axboe@suse.de>

Currently SCSI cdroms show up in /proc/partitions in 2.6, they didn't in
2.4.  And ATAPI cdroms don't show up either.  Mark both as genhd removable
for now, when they are partionable this can be updated.

From: Jens Axboe <axboe@suse.de>

If the drive doesn't support GPCMD_READ_DISC_INFO at all, permit writeable
opens.

Spotted by Jorn Engel <joern@wohnheim.fh-wedel.de>: both the generic and
fs-specific parts of the inode have an i_flags.  find_group_orlov() is using
the wrong one.

strncpy() may not null-terminate the destination.

From: Olof Johansson <olof@austin.ibm.com>

A smt_snooze_delay of 0 is supposed to mean "disabled", but current idle
loop logic doesn't take that into account and snoozes immediately instead.

Below patch fixes the logic in the idle loop, as well as cleans up the test
a bit.  An idling processor might no longer see a snooze change
immediately, but that's not needed anyway.

From: Anton Blanchard <anton@samba.org>

From: Marcus Meissner <meissner@suse.de>

With 2.6.4 we now have the glorious hidden d_type passing in getdents.

glibc CVS expects this to be passed if we have a kernel version after
2.6.4, so we have to also handle it in the 32bit syscall converter.

From Dave Miller:

We weren't handling a NULL 'type' argument to mount() properly,
f.e. this happens legitimately when changing the options of an
existing mount.

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

I stupidly used the global jfs_log_sem to protect log->sb_list when
implementing the shared journal stuff.  Since we already hold
LOG_LOCK, it makes more sense to use that to protect log->sb_list.
This caused horrible serialization when running on lots of jfs
volumes.

Remove the hold_metapage call from txLog to prevent a hang.
While investigating this one, I audited all functions that held
metapage locks and found several error paths that did not release
them correctly.  These are fixed as well.

I tried to build usb/gadget/file_storage.c (CONFIG_USB_FILE_STORAGE=y),
but it uses "handle_exception()" for its own purposes, which conflicts
with the ia64 definition.  ia64 only uses handle_exception() within
arch code, so it seems like we ought to rename it to be ia64-specific.
done_with_exception() looks similar, so I renamed it as well, although
there's no actual conflict.

The patch below fixes issue with 'tc class show dev <dev>' not showing any
classes when TBF qdisc is present in the chain. PLease consider for
inclusion.

Brett E. <brettspamacct@fastclick.com> noticed the missing service lock
for editing dest.

Julian Anastasov <ja@ssi.bg> provided the patch.

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

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

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

This fixes a bug in the swapcontext system call on ppc32.

On ppc32, the system call entry only saves the volatile registers,
except in the case of a few system calls (e.g.  fork) which need all the
registers saved.  Swapcontext needs all the registers but we weren't
saving them all. So fixes that.