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

M68k: Remove superfluous whitespace that hurts my eyes with `let
c_space_errors=1' in vim. This includes correcting trailing whitespace and
spaces in front of tabs. `diff -urNbB' shows no difference before/after.

In MAINTAINERS and in individual low-level drivers.

* bug fix: make sure 'nsect' member of struct ata_queued_cmd is
initialized each time a cmd is re-used.  Only affects PIO data xfers,
which nobody uses.
* slightly change the way a device's flags are printed out.  currently
the only flag is 'lba48', but soon 'wcache' will appear also.
* add WB-cache-related constants and macros to linux/ata.h

avoid sharing IRQ12
http://bugzilla.kernel.org/show_bug.cgi?id=2665

This fixes a corruption problem with overlapping copyarea()'s
in the radeon driver.

At the moment, on PPC64, the instruction we use for wmb() doesn't
order cacheable stores vs. non-cacheable stores.  (It does order
cacheable vs. cacheable and non-cacheable vs. non-cacheable.)  This
causes problems in the sort of driver code that writes stuff into
memory, does a wmb(), then a writel to the device to start a DMA
operation to read the stuff it has just written to memory.

This patch solves the problem by adding a sync instruction before the
store in the write* and out* macros.  The sync is a full barrier that
orders all loads and stores, cacheable or not.  The patch also moves
the eieio instruction that we had after the store to before the load
in the read* and in* macros.  With the sync before the store, we don't
need an eieio as well in a sequence of stores, but we still need an
eieio between a store and a load.

I think it is better to do this than to turn wmb() into a full memory
barrier (a sync instruction) because the full barrier is slow and
isn't needed with the sync in the write*/out* macros.  This way,
write*/out* are fully ordered with respect to preceding loads and
stores, which is what driver writers expect, and we avoid penalizing
users of wmb() who are only doing cacheable stores.

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

 - Split PA7300LC from PA7100LC (Matthew Wilcox)
 - Handle 32-bit firmware and 64-bit kernel at runtime (Ryan Bradetich)
 - Fix building in a separate tree (Matthew Wilcox)
 - Update defconfigs (Randolph Chung)
 - Make WCHAN work (Randolph Chung)
 - Initial support for SMP in 2.6 (Grant Grundler)
 - Use 8-byte PTEs on 32-bit kernels (James Bottomley)
 - Implement L2/L3 hybrid page tables for 64 bit kernels (James Bottomley)
 - Support 8TB of physical and virtual address space (James Bottomley)
 - Macro'ise the tlb miss handlers (James Bottomley)
 - Check the ptrace flags correctly in the syscall return path (Randolph Chung)
 - Eliminate many magic numbers (James Bottomley)
 - Work around linker bug in vmlinux.lds.S (James Bottomley)
 - Many cache flushing fixes (James Bottomley)
 - first baby step for PA8800 support (Grant Grundler)
 - Self-aligning spinlocks (Randolph Chung)

M68k: <asm/virtconvert.h> needs include <linux/compiler.h> for
__attribute_const__ (from Richard Zidlicky)

Sun3x: Like most other platforms, Sun3x needs conswitchp set if
CONFIG_DUMMY_CONSOLE is defined (from Sam Creasey)

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

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

into redhat.com:/spare/repo/net-drivers-2.6

into redhat.com:/spare/repo/net-drivers-2.6

	ntfs_fill_super() and ntfs_read_inode_mount() cleaned up.  Removed
the kludges around the first iget() on NTFS.  Instead of playing with
(re)setting ->s_op we have the MFT_FILE inode set up by explicit new_inode()/
set ->i_ino/insert_inode_hash()/call ntfs_read_inode_mount() directly.
That kills the need of second super_operations and it allows to return
error from ntfs_read_inode_mount() without resorting to ugly "poisoning"
tricks.

into redhat.com:/spare/repo/net-drivers-2.6

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

From: "Andrew Vasquez" <andrew.vasquez@qlogic.com>

Ok, well there aren't too many folks using an QLA2100 in a fabric
topology, if there were, they wouldn't have gotten very far in the
driver load sequence.  I've been able to scrape-up a QLA2100, 1Gig
switch, and an JBOD.  Upon loading the 8.00.00b12k driver, the
firmware successfully logs into the switch, the driver receives a
LOOP_UP event, but, the kernel panics due to NULL pointer dereference
while trying to perform an RFT_ID  -- the attached patch against
current scsi-misc-2.6 fixes that problem.

The patch to close all the open/close/hotplug races in sr left the
module refcounting broken so that the ULD housing the CD device now
can't be removed until the device itself is removed.

This patch (structurally identical to the one for sd.c to perform the
same function) fixes the module refcounting.

This fixes a situation where the handler can exit too early.

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

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

      in handling of corner cases.

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

into redhat.com:/spare/repo/libata-2.6

From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

one of the macros for get_thread_area extracts the wrong bit.  The
"32bit" field is in bit 22, not 23 (as can be seen in desc.h). 

[ Fix ia64/x86-64 too, while we're at it. Linus ]

From: Andi Kleen <ak@muc.de>

Set up SMT for the domain scheduler on x86-64.  This way the scheduling
works better on HyperThreading aware systems; in particular it will use
both physical CPUs before sharing two virtual CPUs on the same package. 
This improves performance considerably in some cases.

Based on the i386 code and a previous patch from Suresh B. Siddha.

From: Andi Kleen <ak@muc.de>

From: Suresh B. Siddha

Convert sibling map on x86-64 to cpumasks.

This is needed for the SMT patches.

From: Rusty Russell <rusty@rustcorp.com.au>

PowerPC64 ABI has ".funcname" (the actual function) and "funcname" (the
function descriptor) and we strip off the dots in "dedotify" called from
module_frob_arch_sections().  We need to also de-dotify the corresponding
names in the __version section.

Actually has nothing to do with __down, it's just that we only print the
first symbol whose version is missing.

From: Paul Mackerras <paulus@samba.org>

It turns out that we are not handling the TABDLY bits of the termios
c_oflag field correctly on PPC, PPC64 and Alpha.  These three architectures
have a value for XTABS that is different from the TAB3 value.  POSIX
specifies that setting the TABDLY field to TAB3 should result in tabs being
expanded to spaces.  In n_tty.c:opost() we check for O_TABDLY(tty) ==
XTABS, which is fine on most architectures because they have XTABS == TAB3.

I think the right thing to do is just to change the definition of XTABS to
be the same as TAB3 on these architectures.  The patch below does this for
PPC and PPC64 (and I suggest the Alpha maintainer should do the same).  At
the moment, applications using either the XTABS or TAB3 values won't get
the expected behaviour.  With this patch, apps that use TAB3 will get the
expected behaviour.  Apps that use XTABS will need to be recompiled (but
note that the POSIX-specified name to use is TAB3 not XTABS).

Peter Braam said:

    I would just like to say that I have no difficulties with intermezzo
    being rm -rf'd.  There are probably only a handful of users.  

    In the past 4 years nobody has supported InterMezzo sufficiently for
    it to become successful.  I have been fortunate to get really good support
    for the Lustre project.  So I have focussed on that.  Lustre 1.X has
    become really solid.

    The disconnected operation, caching and mirroring functionality of
    InterMezzo will become available in Lustre as a new feature in version 2. 

     So I see no point in keeping InterMezzo if it is a nuisance. 


The patch removes the references to intermezzo.  Please do a `bk rm' of
fs/intermezzo.

From: Olaf Hering <olh@suse.de>

make tags skips security/selinux/include because of find .  -name include
-prune This patch does just add it later.  No idea if it can be done
better.

From: Christoph Hellwig <hch@lst.de>

(partially from the debian kernel tree)

From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes two #ifdef's for kernel 2.2 from
linux-2.6.2-mm1/drivers/telephony/ixj.h

From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes some #ifdef'd kernel 2.2 code from
drivers/net/hamradio/dmascc.c.

From: Joseph Parmelee <jparmele@wildbear.com>

Fixes improper setup of the mixer on Crystal soundcards with the CS4235
chip.

fbcon needs this symbol.