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

Try to avoid calling "pfn_to_page()" on invalid pfn's.  It used to be
legal, but the CONFIG_DISCONTIGMEM people want us to try to avoid it,
since they do magic stuff in their "pfn_to_page" translations.

Just make x86-64/amd64 compile again.  Only architecture specific
changes.

And a workaround for the Opteron prefetch bug.

Also remove the obsolete LVM1 ioctl emulation code.

Brown paperbag time. I forgot to take the modrm byte in account
with the prefetch patch replacement.  With 3.2 it worked because
it used the right registers in my configuration.

But gcc 2.96 uses a different register in __dpath and the prefetch becomes
4 bytes with modrm and the original nop needs to be as long as that too.

Leftovers from the mem_map_reserve-removal patch.

into home.transmeta.com:/home/torvalds/v2.5/linux

Changes:

  - Convert to a static highlevel handle for all drivers. Gets rid of
    a kmalloc for each driver and consolidates the highlevel handle and
    highlevel ops. Reduces points of failure as well.
  - Move host number allocation to hosts.c, giving all drivers access to
    it.
  - Implemented S800 changes for core and sbp2. Thanks to TI and LaCie
    for hardware to test this. 1394b support coming soon.
  - Convert nodemgr to using a similar device classification hack as
    usb. The old class_num hack I had in place was broken do to its
    removal. This is a much cleaner solution.

into kroah.com:/home/linux/linux/BK/gregkh-2.5

Missed parts of the ioctl32 compatibility patch: a few ioctls from
PA-RISC, and missing <linux/compat_ioctl.h> file.

Here are two vicam.c patches to clean up and restore copyright notices
for 2.4.21-rc1 and 2.5.68-bk9. At some point in time Pavel and my
copyrights were remove inadvertenly from the code.

drivers/input/misc/uinput.c::uinput_alloc_device(): reduce stack size
from 0x480 to 0x24;

reduce stack usage in sw_connect() from 0x490 to 0x98 on P4 SMP (gcc 3.2);

 - kill dups in ide.c and ide-disk.c
 - read_24() is exported so rename it to ide_read_24()
 - add it ide.h

They are unused, not needed and identical to generic ones so kill 'em:
    task_read_24(),
    task_try_to_flush_leftover_data(),
    taskfile_dump_status(),
    taskfile_error().

There's an (fortunately unused) devfs in misc_register currently,
when the name of the miscdevice contains a slash the name is used
as devfs name instead of misc/<name>.  Kill if as we have .devfs_name
for this kind of stuff now.

ioctl32 cleanups are pretty neccessary (we have 6+ copies of 600+
lines tables, all getting slightly out of sync, not speaking about
surrounding code produced by cut-and-paste).

There's three drivers in the tree that workaround the suboptimal
devfs name choice of the misc device layer (/dev/misc/<foo>) using
devfs_mk_symlink.    Switch them to set miscdev.devfs_name instead
to get the right name from the very beginning.

into home.transmeta.com:/home/torvalds/v2.5/linux

into samba.org:/home/paulus/kernel/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

- Remove all uses of unnamed structs and unions in the driver to make
  old and newer gcc versions happy. Makes it a bit uglier IMO but at
  least people will stop hassling me

into cantab.net:/home/aia21/ntfs-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

From: William Lee Irwin III <wli@holomorphy.com>, Robert Love

Add some spinlock protection around the oom-killer state.

From Robert Day, through "Randy.Dunlap" <rddunlap@osdl.org>

This is a patch from Robert Day that does the following:

1) shift menu item in "Processor type and features" menu
2) clean up "Bus options" menu so it's actually hierarchical

Part of it (moving X86_IO_APIC around) looked a little odd to me,
so I asked Roman Zippel about it, and he replied:

"It's correct, although I wouldn't call it a 'design quirk'. :)
It forces one to group options which belong logically together and in this
case X86_IO_APIC is really a bit misplaced, even if it's not visible."

I have tested it (on 2.5.68-plain) and it does indeed make the menus
more hierarchical.

The percpu counters break UML SMP compilation (in current 2.5.58 bk snapshot)
(first NR_CPUS undeclared in header, then dereference of incomplete structure
in .c file)

From: Janet Morgan <janetmor@us.ibm.com>

Here's a small patch that adds aio_read and aio_write methods to the
block device driver.

Fix a bug identified by Nikita Danilov: refill_inactive_zone() is deferring
the update of zone->nr_inactive and zone->nr_active for too long - it needs
to be consistent whenever zone->lock is not held.

From: john stultz <johnstul@us.ibm.com>

- Whitespace fixes

- Fix for the case where HZ != 1000 (pointed out by Mika Penttila).

From: Manfred Spraul <manfred@colorfullife.com>

Update some no-longer-true comments around nr_threads locking.

From: Ernie Petrides <petrides@redhat.com>

The problem resolved by this patch is that if a root file system has an
error recorded from a previous mount, and then (when rebooting) the orphan
recovery procedure is initiated, the recovery is correctly skipped but the
file system is incorrectly left in a writable state.

This causes the subsequent fsck to fail due to the root file system
being dirty, and then requires manual intervention to get the system
fully booted.