into mulgrave.(none):/home/jejb/BK/scsi-misc-2.6

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

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

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

From: 	Moore, Eric Dean <Emoore@lsil.com>

Remove the internal queueing so that commands
aren't stored in the driver and thus it doesn't
have to worry about whether the IOMMU resources
are allocated or not.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Render left to right instead of top to bottom.
This shaved a whole second off the:
	time cat MAINTAINERS
benchmark.
Signed-off-by: David S. Miller <davem@redhat.com>

From: 	Mukker, Atul <Atulm@lsil.com>

i.      Function reordering so that inline functions are defined before they
        are actually used. It is now mandatory for GCC 3.4.1 (current
stable)

        Declare some heavy-weight functions to be non-inlined,
        megaraid_mbox_build_cmd, megaraid_mbox_runpendq,
        megaraid_mbox_prepare_pthru, megaraid_mbox_prepare_epthru,
        megaraid_busywait_mbox

                - Andrew Morton <akpm@osdl.org>, 08.19.2004
                linux-scsi mailing list

        "Something else to clean up after inclusion: every instance of an
        inline function is actually rendered as a full function call,
because
        the function is always used before it is defined.  Atul, please
        re-arrange the code to eliminate the need for most (all) of the
        function prototypes at the top of each file, and define (not just
        declare with a prototype) each inline function before its first use"

                - Matt Domsch <Matt_Domsch@dell.com>, 07.27.2004
                linux-scsi mailing list


ii.     Display elapsed time (countdown) while waiting for FW to boot.

iii.    Module compilation reorder in Makefile so that unresolved symbols do
        not occur when driver is compiled non-modular.

                Patrick J. LoPresti <patl@users.sourceforge.net>, 8.22.2004
                linux-scsi mailing list
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

- copyarea checking of src/dst y being equal was buggy.
- set optimal FBINFO flags for this device.
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

into kroah.com:/home/greg/linux/BK/usb-2.6

Rusty decided to preprocess a *.lds.S file in parallele with the new *.lds infrastructure
being added to kbuild. Fix that up.
Also added the file to targets so we do not see recompile each time the kernel is build.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

A bug that slipped through when introducing Makefile.host.
A good way to check if people actually uses make O= ;-)
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Gadgetfs updates:

 - Resolve a problem that came from a change in the API to AIO:
   kiocb->private type and size changed, but the name remained
   the same ... so GCC wouldn't report pending memory-corruption.

 - Probe the controller at runtime, eliminatingting config-specific
   defines which need to be updated for each new controller.  Rip
   out the old #defines.

 - Use newish APIs to let VBUS current be used to recharge
   batteries (or whatever).

 - Use no_llseek() ... endpoints are pure data streams.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Fix tty layer sleep/locking problem (again) ... when this is
called through the network stack (PPP) sleeping isn't allowed.
There's some bugtraq ID for this.

From: Oliver Neukum <oliver@neukum.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Higher layers call set_mctrl if necessary.
Signed-off-by: David S. Miller <davem@redhat.com>

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

Patch from: Linus Torvalds

Update ARM signal handling for Andrew's series of fixes.

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

drivers/scsi/sym53c8xx_2/sym_glue.c: In function `sym_requeue_awaiting_cmds':
drivers/scsi/sym53c8xx_2/sym_glue.c:671: warning: 'cmd' is used uninitialized in this function
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

mesh is only present on older 32bit pmac boards and doesn't compile
on ppc64.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch gets rid of the tcp_default_win_scale sysctl and instead
computes the optimum maximum window scale.  It just means one less
thing to have to tune.  I also moved the code out of the inline because
it gets called three places and isn't in the critical path.

As a side effect, it will cause a smaller window scale for many people
since the default tcp_rmem fits in a win_scale of 2.  This is allows for
finer grain windows (good), but may mask some of the problems with bad
implementations we have already seen (bad).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Olaf Kirch <okir@suse.de>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Christoph Hellwig <hch@lst.de>

We don't need the BKL anymore for thread startup.

Patch rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

The previous workaround didn't enable the BTIC bit on CPUs where it is
broken.  However, it seems some firmwares will unconditionally set it,
so this new patch will actually _clear_ it on CPUs where it is broken.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Recent yenta_socket (and maybe others) rely on some pcibios_* functions
to be available to modules.  This exports them.

The trackpad on recent Apple laptops tend to emmit spurrious 'right
clicks' apparently.  This patch from Alex Clausen fixes it, please
apply.  The trackpad cannot normally emit a right click, so just filter
those out.
Signed-off-by: Alexander Clausen <alex@skip86.com>
Signed-off-by: Michael Schmitz <schmitz@opal.biophys.uni-duesseldorf.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

msnd #defined outb to outb_p, which wasn't a good idea on platforms
that had outb_p #defined to outb ;-)
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

qd65xx assumed that char is always signed
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

"v" and "r" are not good names for variables local in macro...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

That was a nasty one - missing include of config.h in a file that has
non-trivial ifdefs.  With some configs it ended up with very odd conflicts
(we get included early, take the wrong branch of ifdef, then get another
file included, it pulls in config.h and picks the right branch of its
ifdef; surprise, surprise, they conflict).
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>