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

We still retain the default MAX_PHYS_SEGMENTS (which
is currently 128).  However, a mechanism for raising
the limit correctly is added for people who wish to
benchmark with larger sglists.

A decision on how we present this to the user will be
taken at a later time when more information about
the usefulness of a higher limit is available

From: Randy.Dunlap <rddunlap@xenotime.net>,olh@suse.de

make Adaptec AIC7xyx drivers depend on SCSI tristate
(without this you can compile aic7xxx into the
kernel when SCSI is only modular)

spotted by akpm (the select was misspelled in
the SCSI_SIM710 Kconfig option)

his patch moves the internal storage of the offset and period to the
transport class and adds methods to set them (there's no need for a get
method since the value in the transport class is exactly what the driver
believes the transport agreement to be).

You can see how this type of use of the transport class is supposed to
work: the driver now has init and exit routines attaching and releasing
the transport class (that's the reason for the Makefile perturbation
because it has to init before its users).  The correct attributes are
set up in slave_configure() for negotiation and we now export the period
and offset setting functions.

This adds the final missing piece to the transport attributes:  A
published API by which they can be set and retrieved (SPI attributes
only).  The sysfs field only appears writeable if the driver supplied a
set method in the attribute template, so unsettable attributes show up
as read only.

The consequence now is that the spi transport attribute class is no
longer a simple exported structure: the driver has to attach to the spi
transport class at module initialisation.

This patch does two things:

1. Add all the other ppr type transport attributes to the spi class
2. make period settable as the ppr/sdtr period, but display in ns for
the user.

Yes, someone really was stupid enough to make a device with
such a dumb vendor name. In combination with the device name
and rev number though, it shouldn't cause any false positives.

Device in question is some no-name 6-in-1 usb card reader,
whose slots all appear on different LUNs, requiring you
fiddle with scis_mod's max_luns argument unless you have this patch.

No changes whatsoever, just moves entries around to sort
on vendor. I kept the multiple sections, and just
sorted per section.

From: 	Martin Hicks <mort@wildopensource.com>

Transport attributes are classes which can be
attached to by a scsi driver to export (and
later control) transport based properties.

The ipr driver that is currently out for review talks to disk array devices
that require a START_UNIT prior to media ops, similar to normal scsi devices.
However, any time the adapter gets reset, these devices end up needing another
START_UNIT. This causes problems with the current error handling and these
devices get taken offline when this occurs. Attached is a patch which will
better handle these devices and issue a START_UNIT from the error handler
when appropriate.

I was testing different errors while running multipath, and becuase of
a bug in dm-multiapth I hit the "Incorrect number of segments after
building list" error. The attached patch just adds a missing
scsi_release_buffers() at the bottom of the scsi_init_io where the
table was allocated successfully, but you can return BLKPREP_KILL when
someone messes up segment counts.

From: 	Kurt Garloff <garloff@suse.de>

Based on earlier patches from
 Badari Pulavarty <pbadari@us.ibm.com>,
 Matthew Wilcox <willy@debian.org>

- The sysfs directory names are changed from stxmy[n] to the names in
  devices.txt. Below is an example for the first tape drive:
  /sys/class/scsi_tape/
  |-- nst0
  |-- nst0a
  |-- nst0l
  |-- nst0m
  |-- st0
  |-- st0a
  |-- st0l
  `-- st0m

- Name generation for non-default number of modes fixed so that same
  minors get same names even with different number of modes.

- devfs minor generation fixed to work with non-default number of modes

- The alignment requirement is printed in the line logged when a tape is
  attached.

OK, let's export the proc_name then. It's some name that can be used
to identify the driver, works for code both compiled statically or
as module, is reasonably short and very often resembles the module
name.

For the module_name, let's wait for a generic sysfs solution.

From: Christoph Hellwig <hch@infradead.org>

- Remove dead forward declarations

- Fix compilation of the interrupt handler.

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

Some SGI RAID devices identify as being SCSI-3, so they don't need
to be in the scsi_static_device_list any more.  I've tested to make
sure that all luns still show up in a sparse, large config.

So I'm proposing removing them.  Thanks to hch for the suggestion.

Device type 0x0C is RAID, so show it as such

For some unknown reasons Nvidia NForce3 doesn't use the standard Hammer AGP architecture,
but requires set up of some shadow registers. This patch adds that to the K8 AGP driver.

Based on an old 2.4 patch from someone at Nvidia.

Also includes another bug fix for the K8 AGP handler, from Brad House.
We should not assume that there is only one northbridge in a Uniprocessor system.
Always flush all.

Also some minor cleanup.

Give 32bit emulation ioctl handlers the same locking rules as normal ioctl handlers.
This will avoid surprises in driver code.

Most call sys_ioctl who would take it anyways.

This adds a new completely rewritten machine check handler for x86-64.
The old one never worked on 2.6.

The new handler has many improvements. It closely follows the Intel and AMD
recommendations on MCE handlers now (the old one had many violations). It handles
unrecoverable errors in user space better now - it will only kill the process now
if possible instead of panicing.

This one is CPU independent now - it should work on any CPU that supports the standard
x86 MCA architecture.

This new handler only logs fatal errors that lead to kernel panic to the console.
Non fatal errors are logged race free into a new (non ring) buffer now
and supplied to the user using a new character device.  The old one could
deadlock on console and printk locks. This also separates machine check errors
from real kernel errors better. The new buffer has been also designed to
be easily accessible from external debugging tools: it has a signature
and could be even recovered after reboot. It is not organized as a ring buffer -
this means the first errors are kept unless explicitely cleared.

The new error formats can be parsed using ftp://ftp.suse.com/pub/people/ak/x86-64/mcelog.c
The new character device for it can be created with mknod /dev/mcelog c 10 227

There is a new sysfs interface to configure the machine check handler.
It has a "tolerant" parameter that defines the aggressiveness of the machine check:

0: always panic
1: panic if deadlock possible (e.g. MCE happened in the kernel)
2: try to avoid panic

Default is 2

Despite of having more features the new handler is shorter.

Bring the x86-64 port up to date. Lots of smaller bug fixes that have accumulated.
Also fixes another nasty bug introduced by the IA32e changes that causes BUGs at
boot for some people.

Only changes x86-64 specific files. There are some other changes that I'm sending
separately.

 - Some cleanup in NMI watchdog code
 - Fix HyperThreading CPU setup race (Suresh B. Siddha)
 - Update defconfig
 - Add a comment on why iommu_fullflush is disabled.
 - Export sys_ioctl again
 - Fix build with IA32_EMULATION=y and SYSVIPC=n
 - Remove noisy boot printks in the mptable scan.
 - Implement automatic NMI watchdog switching for real now
 - Remove redundant 32bit ioctl handlers for autofs
 - Remove CONFIG ifdefs around rtc 32bit ioctl handlers
 - Remove useless nfsctl ifdef in syscall.c (Al Viro)
 - Increase padding for prefetchw alternative
 - Check for NX bit early before setting up memory maps (Suresh B. Siddha)
 - Change Intel IA32e config description and fix help texts (Jun Nakajima)
 - Fix microcode driver build really now (Dave Jones)
 - Add nohpet option to disable HPET timer
 - Fix double semicolon in aperture.c
 - Add cmpxchg16b cpuid entry
 - Fix return value of read_pci_config_16 (Paul Menage)
 - Fix __KERNEL_COMPAT32_CS (Zachary Amsden)
 - Disable the infamous 30 minutes check in CMOS time setting
 - Update URLs in Kconfig (Petri T. Koistinen)
 - Fix ACPI interrupt source parsing for Nforce3 (Maciej W. Rozycki)
 - Fix 32bit ipc version parsing.
 - Run local APIC NMI watchdog only once a second (or less often on idle boxes)
 - Merge ACPI APIC SCI functions from i386
 - Add i8254 timer suspend code from i386
 - Merge with 2.6.2-rc3 + minor changes from i386
 - Fix empty_zero_page declaration (Greg Johnson)
 - Readd sysctls for exception/page fault trace and vsyscall32
 - Fix WCHAN
 - Fix STACK_TOP usage. Stack for 64bit processes should be at the
   top of memory now again. Also set it correctly for LINUX32_3GB.
 - Add warning fixes for gcc 3.4 and -Wdeclaration-after-statement

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

From: Andreas Gruenbacher <agruen@suse.de>,
      and me.

Latest gcc cvs is able to detect mismatches between functions which are
tagged asmlinkage and declarations which are missing asmlinkage.  Or vice
versa.

Fix up the fallout from an x86 allyesconfig build.

From: "Randy.Dunlap" <rddunlap@osdl.org>

Add syscalls.h, which contains prototypes for the kernel's system calls.
Replace open-coded declarations all over the place.  This patch found a
couple of prior bugs.  It appears to be more important with -mregparm=3 as we
discover more asmlinkage mismatches.

Some syscalls have arch-dependent arguments, so their prototypes are in the
arch-specific unistd.h.  Maybe it should have been asm/syscalls.h, but there
were already arch-specific syscall prototypes in asm/unistd.h...

Tested on x86, ia64, x86_64, ppc64, s390 and sparc64.  May cause
trivial-to-fix build breakage on other architectures.

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

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

into intel.com:/home/lenb/src/linux-acpi-test-2.6.4

drivers/acpi/sleep/proc.c:359: warning: initialization from incompatible pointer type
drivers/acpi/sleep/proc.c:367: warning: initialization from incompatible pointer type

drivers/acpi/utils.c: In function `acpi_evaluate_reference':
drivers/acpi/utils.c:353: warning: unsigned int format, different type arg (arg 5)