From: Matthew Dobson <colpatch@us.ibm.com>

This patch does the following:
1) Rename ZONE_SHIFT to NODEZONE_SHIFT.  This value is the number
    of bits to shift page->flags to get the node/zone part of the
    bitfield.
2) Add a macro called NODEZONE which takes a node number and zone number
    and returns a 'nodezone', a bitshifted composition of the two.
3) Create page_zonenum & page_nodenum, inline functions to return the
    node/zone a page belongs to with some simple bit twiddling, no
    pointer dereferences necessary.
4) Modify page_zone() and set_page_zone() to use the new NODEZONE_SHIFT.
5) Modify memmap_init_zone() & free_area_init_core() to use the new
    NODEZONE macros.
6) Fix up some comments to reflect the above changes.

From: Russell King, Tom Rini, Dave Jones

As plugged in 2.4 recently.

Fix some leakage of uninitialised memory to userspace via rtc reads.

From: Christophe Saout <christophe@saout.de>

The intent of these are to clarify the meaning of the bio fields in the
bi_end_io function (since we are already mostly there).  After these small
modifications bio->bi_idx and the corresponding bio_iovec(bio)->bv_offset
point to the beginning of the completed data, together with the nr_bytes
argument you know exactly what data was finished, e.g.  when you can't
track it otherwise (or it would be unnecessary expensive).  Apart from that
it's a nice-to-have.

The first mini-patch moves the update of bio_iovec(bio)->bv_offset and
->bv_len after the call of bi_end_io where bi_idx gets updated so they get
updated together.  Ok with Jens.

The second part of the patch modifies the multwrite hack in PIO non-
taskfile ide disk code.  It modifies the bi_idx field to walk the bios and
doesn't reset it correctly before ending the request.  The patch uses the
segment counter in the request field to correctly restore the bi_idx field
before ending the request.  Can't possibly break anything since it's
working on the local request copy ("scratchpad") anyway.  Also does this in
legacy/pdc4030.c (similar code).  The code modified here is going to die
anyway any trying to fix it would be too invasive.  Ok with Bartlomiej.

From: Manfred Spraul <manfred@colorfullife.com>

readdir on /proc has two problems: reading all entries is O(N^2), and
entries are overlooked if tasks die in the middle of readdir: the readdir
implementation remembers the offset into the task list, and if a task
(actually: process) that was returned by previous readdir calls exits, then
a random entry is dropped.

The attached patch fixes the O(N^2) by using f_version to store the pid of
the task that should be returned next.  This speeds up reading /proc to
O(N).  Additionally, it mitigates the effects of dying tasks: Tasks are
skipped only if the task whose pid is stored in f_version exits, all other
task deaths have no effect.  Unfortunately the code has a bad worst case
behavior: if the targeted task exits and a new task with the same pid is
created, then all entries in the task list between old and new position are
dropped.  This should be rare.

From: Bram Stolk <bram@sara.nl>

Fixes for Documentation/fb/modedb.txt and Documentation/fb/tridentfb.txt

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

It turns out that run_workqueue never has signal_pending(), since setting
the handler to SIG_IGN means "don't make zombies, I'm ignoring them".  Fix
the comment, don't allow the signal, and remove the unused waitpid loop.

This also allows simpler conversion of workueues to the kthread mechanism,
which uses signals to indicate it's time to stop.

Spotted by From: Christian Borntraeger <kernel@borntraeger.net>

dma_reset_input() takes dmap->lock, so call it without that lock held.

From: jbarnes@sgi.com (Jesse Barnes)

The 'depends' directive for SGI IOC4 support is too restrictive.  Just make
it depend on ia64.

We leak a page in do_no_page() if pte_chain_alloc fails.

From: Armin <armin@melware.de>

- Allocate buffer of correct size.

- Fix possible buffer overflow.

- Use correct debug level for double registered application.

From: Armin <armin@melware.de>

It fixes access to hardware memory of wrong size and therefore removes a
compiler warning.  The hardware trap variable must be read as 32bit value.

From: Armin <armin@melware.de>

The new driver for Eicon ISDN cards is in drivers/isdn/hardware/eicon.

The old driver is still in drivers/isdn/eicon and I would like to remove
this old driver from the 2.6 kernels.

The attached patch removes the references to this driver, but in addition
the directory drivers/isdn/eicon should be removed.

From: Alex Tomas <alex@clusterfs.com>

start_this_handle() returns 0 always.  because of this journal_start() may
return handle with h_transaction = NULL

From: Andi Kleen <ak@muc.de>

The i386 HPET time setup code would explicitely check for the Intel vendor
ID.  That is bogus because other chipset vendors (like AMD) are
implementing HPET too.  

Remove this check.

From: Rusty Russell <rusty@au1.ibm.com>

Vatsa spotted this: you can remove a module while it's being initialized,
and that will be bad.  Hole was opened when I dropped the sem around the
init routine (which can probe for other modules).

From: Nick Piggin <piggin@cyberone.com.au>,
      Rusty Russell <rusty@rustcorp.com.au>

Prevents a race where sys_sched_setaffinity can race with
sched_migrate_task and cause sched_migrate_task to restore an invalid
cpu mask.

- Make it static

- It is larger and has two callsites: uninline it.

From: Jesper Juhl <juhl-lkml@dif.dk>

I'm compiling 2.6.1-rc1-mm1 with "-W -Wall" to look for potential problems
and minor stuff to clean up.

One of the things that enabling the extra warnings turn up is errors about
the placement of the inline keyword.

Fix warnings and build errors under EXT2_DEBUG.

From: Pavel Machek <pavel@ucw.cz>

Softcursor was broken for half of 2.5 series.  This fixes it by first
hiding cursor _then_ hiding softcursor.  Very simple mistake...

From: Pavel Machek <pavel@ucw.cz>

This is obsolete x86-64 code.

- Add missing locking around s_next_generation increment

- Correctly set the initial value of s_next_generation.

There is no locking around the increment of this per-filesystem counter.
Create a new lock, just for this.

We've cached EXT2_SB(sb) in local variable `sbi'.  Use it.

From: Pavel Machek <pavel@ucw.cz>

This kills outdated docs, and adds some helpful docs about video issues
with suspend.

From: Pavel Machek <pavel@ucw.cz>

wakeup.S includes some rather nasty, and unneccessary debugging code.  (It
used to try to flush caches/tlbs; now its totally useless).

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

MAINTAINERS update

From: "Bryan O'Sullivan" <bos@serpentine.com>

For compound pages, page_count needs to be sure to reference the head page.

This affects code that plays tricks with memory mappings into userspace,
which would mostly involve video drivers.

From: "Nakajima, Jun" <jun.nakajima@intel.com>

Restore the HT detection algorithm.  Make the processor package mapping
subarch-specific so that it can reflect the APIC ID info provided by BIOS
if required.

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

From: Luiz Fernando Capitulino <lcapitulino@prefeitura.sp.gov.br>,
      Randy.Dunlap <rddunlap@osdl.org>

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

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

If we detect an error late in this function, local variable `interpreter' can
be NULL.  Don't try to fput() it in that case.

3c59x has a tunable `rx_copybreak'.  But it's declared const, so recent gcc's
rub it out altogether, and modprobe says `3c59x: falsely claims to have
parameter rx_copybreak'.

This way, the "static char buf" is defined only once instead
of once per file.

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

From: Greg Banks <gnb@melbourne.sgi.com>,

see comment in code.

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

Based on code from Terje Malmedal <terje.malmedal@usit.uio.no>

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

follow_up doesn't check that the passed dentry is at the root of the mounted
file system, so we have to do that, to avoid calling follow_up too many
times.

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

We weren't converting the -E* error code to an nfserr_* error code as we
should.