From: Arkadiusz Miskiewicz <arekm@pld-linux.org>

Both drivers/ide/legacy and drivers/ide/ppc broke because they can no
longer include drivers/ide/timing.h.  Fix.

(Acked by Bart)

x86-64 using drivers/Kconfig requires some minor changes. Mostly to disable drivers
that do not work.

- Mark paride bpck6 not 64bit clean
- Disable I2O on 64bit
- Mark PNP dependent on ISA
- Mark NSP32 driver as not 64bit clean

Mainly lots of bug fixes and a few minor features. One change is that
it uses drivers/Kconfig now like i386. This requires a few minor changes in
outside Kconfig files which I am sending separately.

 - Tighten/fix some code in NUMA node discovery
 - Fix oopses in threaded 32bit coredumps and read correct registers.
 - Merge with 2.6.2rc1
 - Sync arch/x86_64/Kconfig with i386. Uses drivers/Kconfig now.
 - Remove bcopy export
 - Fix check for signal stack for 32bit signals
 - Fix bcopy and exit prototypes for gcc 3.4
 - Fix asm contraint in usercopy.c for gcc 3.4
 - Use rt_sigreturn, not sigreturn for rt sigreturns.
 - Pass si_fault address to 32bit
 - Truncate si_error to 16bit in 32bit emulation to match i386
 - Move IA32 flag switching for 32bit executables to flush_thread
   (code copied from ppc64/sparc64)
 - Print exception trace for strace too, share code.
 - Default to 3GB address space for a.out executables
 - Fix security hole in ptrace. Also fixes some problems with 32bit gdb.
 - Sync mmap address selection algorithm with mm/mmap.c version
 - Disable a.out coredumps completely
 - Fix bug in sigaltstack 32bit emulation. Kylix IDE now works.
 - Move errata 93/BIOS workaround into fault handler.  This should work
   around USB legacy BIOS bugs too, although not completely (we cannot fix
   faults injected by SMM into user space 64bit processes)
 - Quieten some unimplemented 32bit syscall warnings and avoid repeated
   warnings.
 - Set LDT segment limit correctly (fixes problems with some modify_ldt
   user)
 - Remove obsolete ldt rw lock.
 - Remove sys32_modify_ldt. The standard sys_modify_ldt is equivalent.
 - Remove traces of old kgdb support
 - Merge CFI changes from Jim Houston and some other smaller changes The
   kernel assembly functions are described with dwarf2 unwind
   information now, which makes it easier for debuggers to make sense of
   stack backtraces.  The code is only enabled with CONFIG_DEBUG_INFO.
   Note this implies that when you use CONFIG_DEBUG_INFO you may need
   an binutils update.
 - defconfig updated
 - Readd sleep support code (Pavel Machek)
 - Drop fusion and flush workarounds from IOMMU code
 - Add iommu=nofullflush option
 - Rewrite 32bit emulation for siginfo conversion (Joe Korty)
 - Allow remapping of scatterlists after unmap. This fixes some problems
   with the SCSI layer retrying previously mapped sg lists when iommu
   merging was enabled (it's disabled now by default)
 - Port HPET rtc device emulation code from i386

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

We've created a new e-mail address which is currently an open
mailing-list anybody can subscribe to. 

It's currently watched by the main developers.  If spam takes over the
list, we might change it to "moderated" or even route it to one single
person.

A debug printk was left in there by mistake, it'll get printed for every
non-mrw drive. So kill it.

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6

The code directly accessed the "cpucontrol" semaphore used
for CPU hotplug. That doesn't work all that well, since the
semaphore doesn't even exist on UP.

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

into debian.org:/usr/src/kernel/linux-2.6

From: NeilBrown <neilb@cse.unsw.edu.au>

If a raid array was syncing on shutdown, it would hang on shutdown,
constantly re-entering md_enter_safemade.  This fixes it.

slipped in.

I did a s/2.5/2.6/ a while ago, as it made more sense when 2.6 appeared.
The old URL will continue to work (symlink to the new file).  If I move
this again, whack me.

A lot of the blacklists never made it forward, here's what I found
still lying around in my old 2.5 tree when I brought it up to date.

I think 2.4 has had more updates since then (and there may be
some entries languishing in vendor 2.4 trees), I'll take a peek
when I get some spare cycles.

Yet another misplaced ! by the looks..

Looks like another instance of a ! in the wrong place.

Echoing changes done in 2.4. (It now has a pci_pool_create backport).

This currently prints out the maximum number of CPUs the
kernel is configured to support, instead of the actual
number that the kernel brought up. Which results in odd
displays that look like you have more CPUs than you do.

ARM_PACKET_SIZE is 4KB. Ouch.

Grep of the tree only turned up these two uses.

Negate the expression not the register seems more sensible?

If the CPU doesn't support MTRRs, don't create a /proc/mtrr

2KB onstack allocation. Nasty.

The centaur CPU init code gets linking errors without it.

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

sizes will not overflow pagebuf lengths.

SGI Modid: xfs-linux:xfs-kern:164827a

SGI Modid: xfs-linux:xfs-kern:164517a

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

Looks like an obvious typo.  Works fine if "bio" is the name of the
iterator.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch (which has been in my tree for some time now) does 2 things to
the ppc32 signal code:

- The new sys_swapcontext() syscall that we added recently (and which is
  _not_ yet used by glibc, so it's ok to change it slightly at this point,
  glibc kernel version check will limit us to 2.6.2 or 2.6.3) gets a new
  context size argument, so we can deal with future context size changes.

- When ucontext is get/set/swapped using the above syscall, the TLS (r2)
  is preserved (it's still saved/restored on signal entry & return though).

The equivalent of this patch is already in the ppc64 signal32.c emulation,
and it has no effect until glibc is updated to use the new syscall, which
should happen soon now, so please apply.

From: "H. Peter Anvin" <hpa@transmeta.com>

Fix for RAID-6 on IA-64, from Bjorn Helgaas, and verified by me.

From: Chris Meadors <clubneon@hereintown.net>

Add a missing PCI ID.

into debian.org:/usr/src/kernel/sparc-2.6

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

Add back the old i82489DX bits to use timer scaling for the old
non-integrated APIC setup. 

It's possible these bits don't need to be set on i82489DXs,
but not having this HW for testing I elected to maintain
the old behaviour on these old machines.

The cpu handling in net/core/flow.c is complex: it tries to allocate
flow cache as each CPU comes up.  It might as well allocate them for
each possible CPU at boot.

We used to write fields that were marked RESERVED and that
are apparently some old stale timer base. Stop doing that.

Verified with Mikael Pettersson, and confirmed to fix ACPI
boot-time lockups for a few people. 

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