From: 	Justin T. Gibbs <gibbs@scsiguy.com>

From: 	Petri Koistinen <petri.koistinen@iki.fi>

Here is an update to use pci_set_consistent_dma_mask.  But since
dma_alloc_coherent uses dma_mask instead of consistent one, I left in
setting dma_mask as well until the alloc routine changes.

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.

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

ppc64 doesn't use drivers/Kconfig (it should) so it needs to include i2c by
hand.

From: Anton Blanchard <anton@samba.org>

We were missing the sched_balance_exec call.  Could explain some NUMA
scheduling weirdness we were seeing.

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

This is purely a doc patch saying RAID-6 support is available in
mdadm-1.5.0 and the patch is no longer necessary.

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

As expected, when it hit mainline I started getting real bug reports... 
the attached patch does the following:

- Fixes a few x86-64 specific bugs;

- Removes MMX and SSE-1 from x86-64 (if we have x86-64 we have SSE-2);

- Slightly astracts the integer code to make it easier to add
  architecture-specific optimizations later (e.g.  IA64 once gcc gets
  better IA64 intrinsics support);

- Resurrects the user-space testbench, and makes it not output the known
  false positive of the D+Q case (D+Q is equivalent to a RAID-5 recovery,
  so I didn't implement it in the user-space testbench.)

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

RFC 2461 requires that the source address of Neighbor Discovery messages
is an address assigned to the sending interface.

Duplicate Address Detection should also be interface specific. We don't,
for example, want a node to DoS itself just because it has two interfaces
on the same link and both happen to listen to the same multicast group. If
there is a true duplicate on the link, the interface doing DAD will notice
it anyway.

The attached patch adds a 'strict' parameter to ip6_chk_addr() and
ip6_get_ifaddr() to allow link-local protocols like ND and DAD to do
strict address checks even on addresses with greater scope than
link-local.

> Paul Mackerras:
>   o sort exception tables

And as more proof that Paul is leaving us ppc32 folks, *sniff*, the
following is needed for PPC32 to compile:

Here's a novel idea, check the CPU has machine check capabilities
before we start polling registers.

I was wondering why my VIA C3 was starting this.  Who knows it may solve
some of the random crashes I saw there.

This updates / adds documentation for the bttv, saa7134 and cx88
video4linux drivers.

trivial one: uses __init and thus needs linux/init.h

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

       we take the appropriate action. (throw the byte away, reset
       byte counter, return NAK if acking, and complain).

       psmouse_rate= option.

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

Do not pass a NULL mm to mmdrop().

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

From: Gerd Knorr <kraxel@bytesex.org>

Use module_param() rather than the deprecated MODULE_PARM() in this driver.

From: Jes Sorensen <jes@trained-monkey.org>

The new sort_extable and shared search_extable code doesn't work on ia64.
I have introduced two new #defines that archs can define to avoid the
common code being built.  ARCH_HAS_SEARCH_EXTABLE and
ARCH_HAS_SORT_EXTABLE.

From: David Howells <dhowells@redhat.com>

Eliminate the printing of the cache token if present: using cpp
conditionals inside macro expansions is not legal and some gcc's fail it.

From: Steve Dickson <SteveD@redhat.com>

Here is a patch for the 2.6.1 kernel that fixes an oops that occurs when
the sunrpc module is unloaded.

The problem was the RPC cache_register() call was not saving entry pointers
to the procfs entries it was creating.  So when it came time to dismantle
the entires, a BUG_ON() was tripped in remove_proc_entry() since the tree
was not broken down completely.

(acked by neilb)

These printk's come out during normal usage, when accessing locked system
files on the windows machines.

From: Jan Kara <jack@ucw.cz>

A patch which fixes a problem that i_blocks are not updated for quota files
(when quota turned on) in 2.6.1.  The patch also fixes possible unlock of
not locked spin_lock.