From: Sam Ravnborg <sam@ravnborg.org>

In the i386 case we need to generate asm-offset.h, before starting building
the kernel tree.  Building asm-offset.h causes us to use one of the
shorthands in the top-level makefile, namely the one for .s files.  The one
that allows us to do: make some/dir/file.s

And this shorthand happens to have a dependency to scripts, therefore I did
not see this problem on i386.  But David hit it with sparc64, because there
is no asm-offset.h file.  No parallel stuff involved here, just an ordinary
error.

It's now called from the CPU hot-add notifier.

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

fusion needs several separately allocated coherent regions and
requires that they all be in the same 4GB segment.  Obviously this may
fail.  The hack is to force the coherent_dma_mask to 0xffffffff thus
ensuring that all the allocations occur within the first 4GB.  This
hack breaks Altix entirely.

This is an improved version of the G4 "windtunnel" fan controller.  It
depends on the keywest bugfix...

This fixes a deadlock in I2C probing.

 - keywest holds the pmac_low_i2c_lock while registering the i2c adapter.
 - i2c_add_adapter() notifies registered drivers by calling
   driver->attach_adapter().
 - a driver might access the i2c bus from attach_adapter() which
   deadlocks since all xfer routines take the lock.

Attached is a patch to fix an oops in sg_cmd_done. Please apply.

remove dependency on kobj.name.

One more missing doc-file update

Three quarters of the update from Andi was uncommitted due to a bad
patch date and a bug in "bk import -temail"..

Here are the missing parts..

Fix token pasting to work with older gcc versions.

We need a space before the "," that may get pasted away.

Finally nailed this sucker.

con_close() checks the tty->count and then sleeps in acquire_console_sem().
But another process can come in and grab a ref against the tty while
con_close() dropped the BKL.  But con_close() then proceeds to deallocate the
tty->driver_data anyway, even though the tty now has ->count == 2.

Fix that by moving the check for ->tty_count inside console_sem.

There were some nasty bugs in the x86-64 code, including one race that
could cause random reboots, especially on Intel machines, with the NMI
watchdog.  This patch fixes them and also includes some harmless
cleanups.

Main fixes were for some buglets in the IOMMU code and the plugging of a
race in the exception stack handling.  Also disables an broken MCE on K8
explicitely.

Also finally the preempt compile issues are fixed.

 - Declare hpet interrupt separately in drivers/char/rtc.c
 - Fix rtc.h/hpet.h to not depend on interrupt.h
 - Finally include smp_lock.h in hardirq.h
 - Update defconfig
 - Export bad_dma_address
 - Merge with 2.6.5rc2
 - Never schedule on interrupt stacks.
 - Add option to force software iotlb (iommu=soft)
 - Add ifdefs to gsi patch to match i386 (Bjorn Helgaas)
 - Fix K8 GART TLB MCE workaround to actually work
 - Fix dwarf2 unwind table in SAVE_ARGS (Jim Houston)
 - Disable APIC on VIA/NVidia even with acpi=off (Gwenole Beauchesne)
 - Fix parsing bug in "apic" option (Gwenole Beauchesne)
 - Fix dma mask handling in pci_alloc_consistent
 - Make pci_alloc_consistent more robust in low memory situations.
 - Print version number in oopses (from i386)
 - ACPI GSI cleanup (Bjorn Helgaas)
 - Disable K8 GART TLB walk error MCE explicitely
 - Add support to disable individual MCEs in the various banks.

From: "Colin Leroy" <colin@colino.net>

The fan driver I wrote for adt746x looks like it only handles the adt7467
chip found in iBooks G4; but it also handles the adt7460 chip found in the
Powerbook G4 Alu.  Here's a patch that updates therm_adt7467.c, Kconfig and
Makefile.

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

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

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

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

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

This rolls up Marc Zyngier's EISA correction (first two) and adds a missed
netdev_priv() conversion that was causing an oops on module removal.

Noticed by Jan Glauber, confirmed by Stephen Hemminger.

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

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

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

Call pci_claim_resources() so we can see what PCI resources are being used.

On ia64, the parent resources are not necessarily PCI resources and
so won't get found by pci_find_parent_resource.  Use the shiny new
insert_resource() function instead, which I think we would have used
here had it been available at the time.

If we start again, we can return an error even if we were successful.
Reset the result to 0 before beginning again.  Why don't we use a
tailcall here?

This prevents the "optimize && ?" message appearing when the kernel
configuration tool is run.  The message could be eliminated from the
tool, but I'd rather fix the needlessly over-complicated expression:

From:  "Bailey, Scott" <scott.bailey@eds.com>

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

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