The patch below makes the needlessly global function aic7xxx_info 
static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

Here are new PCI ID's for SAS and Fibre Channel
LSI Logic controllers.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

OK, so I exported the wrong symbols ...
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

With rejection fixes around the removal of scsi_syms.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Lets show the mid layer as a good example and remove the host lock
around the scsi_done() call.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

===== drivers/scsi/scsi.c 1.148 vs edited =====

The patch below removes scsi_syms.c and moves the EXPORT_SYMBOL's to the
files where the actual functions are.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	Christoph Hellwig <hch@lst.de>

pass pointers to Scsi_Host and the private data around instead of using
indices into global arrays all over the place.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

the driver oopses on load for me currently, but to debug it I need to
actually be able to read the source..
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

Building with gcc -W revealed this warning:
arch/i386/kernel/traps.c: In function `do_general_protection':
arch/i386/kernel/traps.c:506: warning: empty body in an if-statement

upon inspecting the code I see what looks like a mistakenly placed ";"

        if (!fixup_exception(regs)) {
                if (notify_die(DIE_GPF, "general protection fault", regs,
                                error_code, 13, SIGSEGV) == NOTIFY_STOP);
                        return;
                die("general protection fault", regs, error_code);
        }

That ";" after the second if should go away so the return; before die()
is not unconditional.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Len Brown convinced me that the problem with disabling
PCI routing entries wasn't the disable as much as the
fact that ELCR needs to be updated when removing the PCI
routing. So this reverts the previous cset and updates
ELCR as suggested by Len.

Ignore offline CPUs when registering IOSAPIC interrupts.  We previously
directed interrupts even to offline CPUs, which means that if you have some
unused CPUs (e.g., you used "maxcpus="), some interrupts won't work.

This really hurts because distro installs typically use "maxcpus=1".

Patch by Alex Williamson.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

This fixes at least some interrupt polarity setup cases.
The ACPI guys may want to eventually do this differently, but
in the meantime this makes ACPI behaviour closer to non-ACPI
behaviour, and fixes known problems.

I'll further argue that this protects non-PCI devices that may
just share the irq routing from being screwed, but that may or
may not be an argument that everybody buys into.

This depends on the previous ptrace single-step cleanup,
and makes sure that signal handling does not lose TF events.

This allows debuggers to trace programs that set TF on their
own.

(This makes the naming of "DTRACE" purely historical, since
on x86 it now means "single step in progress").

Update for the tuner module: add support for a new tuner chip.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

convert more modules to new-style insmod options.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

#ifdef out a currently unused (in-kernel) function, lets see if any
out-of-kernel users cry.  If not we can drop it altogether later on.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some places which need adaption to the last video-buf API change where
forgotten, this patches fixes them up.  Hope I really caught them all now.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Prevents user-space including spinlock.h which breaks the build.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patch below fixes a typo in init/Kconfig for option CC_ALIGN_FUNCTIONS.
Signed-off-by: Cal Peake <cp@absolutedigital.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch below fixes wrong arguments to outw in smc91c92_cs.c
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix the mmput bug introduced while fixing cmdline race.
Signed-off-by: Prasanna Meda <pmeda@akamai.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here's a patch to include Dell's 4th generation Remote Access Controller
ids.
Acked-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch for SELinux fixes a bug in the mapping of socket types to
security classes and ensures that Unix seqpacket sockets are mapped to an
appropriate security class.  The Unix stream security class is re-used in
this case as it has the same permission checking applied as for seqpacket. 
Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We just spent some days fighting a rare race in one of the distro's who backported
some of timer.c from 2.6 to 2.4 (though they missed a bit).

The actual race we found didn't happen in 2.6 _but_ code inspection showed that a
similar race is still present in 2.6, explanation below:

Code removing a timer from a list (run_timers or del_timer) takes that CPU list
lock, does list_del, then timer->base = NULL.

It is mandatory that this timer->base = NULL is visible to other CPUs only after
the list_del() is complete. If not, then mod timer could see it NULL, thus take it's
own CPU list lock and not the one for the CPU the timer was beeing removed from the
list, and thus the list_add in mod_timer() could race with the list_del() from
run_timers() or del_timer().

Our race happened with run_timers(), which _DOES_ contain a proper smp_wmb() in the
right spot in 2.6, but didn't in the "backport" we were fighting with.

However, del_timer() doesn't have such a barrier, and thus is subject to this race in
2.6 as well. This patch fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The "udbg" code used on ppc64 for early consoles including early serial
console recently got a new "default speed" option. This was implemented
as a switch case that missed a few important cases, one beeing necessary
for a board beeing released soon.

This patch fixes it by using the proper division to calculate the dll
value for the uart instead of that bogus switch/case.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The pci_bus_to_host() inline function used on ppc64 to find the pci_contoller
structure a give pci_bus resides on used to contain bogus tree walking code,
which fortunately ended up never beeing necessary since "sysdata" always points
to a device_node structure that has the proper "phb" field (even if it is not
the device-node of the actual P2P, which happens during boot).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes a typo in the code that parse Open Firmware properties
for devices under an "isa" node, the incorrect struct size was used when
parsing the "reg" property of these.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The ppc64 kernel can be built with a default command line (CONFIG_CMDLINE)
for cases where none is provided by the firmware.

However, some OF implementation always pass a "bootargs" property that only
contains the "0" terminating byte of a C string which caused us to think
there was a command line, and not use the built-in one. This patch fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

third argument in module_param is the sysfs permission not a default
value.  This fixes things for rivafb in 2.6.10-rc2:
Signed-Off-By: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From Guido Guenther <agx@sigxcpu.org>

this patch against 2.6.10-rc2 finally detects rivafb on NV30 based power
books by adding the pciid. Wolfram Quester tested it and reported it
working. It also cleans up the error code reported from the probe
function.

From Antonino Daplas <adaplas@pol.net>
- do not validate mode if monitor specifications are not available
Signed-Off-By: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Do a set_par very late instead of during fbcon_blank by setting the
  FBINFO_MISC_MODESWITCHLATE flag which should help prevent
  lockups when switching from X
- Shorten chipset names that were missed before
- Do not validate modeline if monitor specifications are not available
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes the screen corruption resulting from neofb cleanup.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ChangeSet "adaplas: [PATCH] fbdev: Add __iomem annotations to hgafb" had
actually broken it - it not only added a (useless) cast in rowaddr(), it
had also added a dereferencing.

Since it is video memory and since we do memory transfers on the
resulting "address"...  IOW, it's even exploitable - not that there had
been a lot of HGA boxen out there, but... 

This restores the intended behaviour.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

missing __user annotations + removal of gratitious casts in LHS of
assignments.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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