From: Nathan Lynch <nathanl@austin.ibm.com>

This seems to have slipped in during a manual merge at some point.

From: Zwane Mwaikambo <zwane@arm.linux.org.uk>

A kernel janitor recently got confused by the advice in SubmittingPatches
and was sending patches with the wrong strip level, i think just about
everyone would prefer standard patches.  Also mention various patch
management scripts for batching up large deltas.

From: Herbert Xu <herbert@gondor.apana.org.au>

This patch sets the module license for mcheck/non-fatal.c.  The module
doesn't work at all without this as one of the symbols it needs is only
exported as GPL.

From: Christoph Hellwig <hch@lst.de>

The partportbook is licensed under the GFDL and Linus agreed to remove
all GFDL licensed files in
http://www.ussg.iu.edu/hypermail/linux/kernel/0306.1/1968.html.

I pinged the author the first time on the 2nd of april but still didn't get
a reply, then send a patch to Linus to remove it last week but linus
ignored it.  Here's the patch again:

From: Christoph Hellwig <hch@lst.de>

this file has been broken for ages, but it seems few !CONFIG_MMU users use
mainline at all.

From: <a.othieno@bluewin.ch> (Arthur Othieno)

Duplicate definition of dma_unmap_single() should actually be
dma_unmap_page().

(acked by Tom Rini)

Both ->writepage() and ->writepages() should return 0 or a negative error
code.  It shouldn't return the number of bytes which were written.

From: Trond Myklebust <trond.myklebust@fys.uio.no>

   Redirty the page if all of the modified parts of the page weren't
   written out.

From: "Randy.Dunlap" <rddunlap@osdl.org>

These are EXPORTed SYMBOLs; 'inline' was removed from them in ll_rw_blk.c
on 2002-11-25.

From: Alan Stern <stern@rowland.harvard.edu>

This patch is needed to work around gcc-2.96's limited ability to cope with
long long intermediate expression types.  I don't know why the code
compiled okay earlier and failed now.

From: Matt Porter <mporter@kernel.crashing.org>

A copyright change to properly show the lineage of this file.

From: Pavel Machek <pavel@ucw.cz>

Stefan has pretty useful tips for getting S3 to work on radeon notebooks.
This brings whole new class of systems to be usable for S3.

From: Armin Schindler <armin@melware.de>

This patch removes the function to call a usermode helper if the hardware
and its firmware has a problem.  This feature is already implemented in the
user utility and the driver does not need to care about it.

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

mm/hugetlb.c is putting the destructor in head->lru.prev not head[1].mapping;
fix below along with nuking huge_page_release(), which simply duplicates
put_page().

By requiring that compound pages implement destructors we can drop some code
from put_page().

->writepage() is supposed to return zero or a negative error code.  Returning
the number of bytes written will confuse the VFS.

We have interesting deadlocks when slab decides to use order-1 allocations for
ext3_inode_cache.  This is because ext3_alloc_inode() needs to perform a
GFP_NOFS 1-order allocation.

Sometimes the 1-order allocation needs to free a huge number of pages (tens of
megabytes) before a 1-order grouping becomes available.  But the GFP_NOFS
allocator cannot free dcache (and hence icache) due to the deadlock problems
identified in shrink_dcache_memory().

So change slab so that it will force 0-order allocations for shrinkable VFS
objects.  We can handle those OK.

From: Marek Szuba <scriptkiddie@wp.pl>

Use the configured default NLS rather than hardwire it.

From: Matt Mackall <mpm@selenic.com>

This function doesn't correctly accumulate -EIO for its caller.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

This patch add a system control that allows to switch off the jiffies timer
interrupts while a cpu sleeps in idle.  This is useful for a system running
with virtual cpus under z/VM.

From: Matt Domsch <Matt_Domsch@dell.com>

I moved the home of the efibootmgr utility from domsch.com to
linux.dell.com.  Note the move in drivers/firmware/Kconfig, also note
version 0.5.0-test3 or above is necessary.

From: Matt Domsch <Matt_Domsch@dell.com>

Patch below fixes three small bugs in efivars.c as posted by Matt Tolentino
last week and included in the latest -mm.  Aside from this small patch, I'm
quite pleased with Matt T's work, thanks!

- dummy() used for reading write-only sysfs files should return -ENODEV to
  indicate failure, not 0.

- efivar_create() should return the number of bytes written on success, not
  zero.

- efivar_delete() should return the number of bytes written on success, not
  zero.

From: Matt Tolentino <metolent@snoqualmie.dp.intel.com>

Third efivars driver update patch that removes x86 references to the /proc
version of the driver.

From: Matt Tolentino <metolent@snoqualmie.dp.intel.com>

Second efivars driver update patch that adds efivars into the drivers/firmware
directory.

From: Matt Tolentino <metolent@snoqualmie.dp.intel.com>

I broke up the efivars driver update patch I had sent out quite a while ago
into several smaller patches.  This includes several fixes and suggestions
that were pointed out.  The patches are broken down as follows:

1 - remove all traces of efivars from arch/ia64/
2 - add new sysfs based efivars driver into
    drivers/firmware with accompanying Kconfig/Makefile
    changes to make it fully functional for ia64 again.
3 - cleans up x86 references to the /proc version of
    the efivars driver.

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k bitops updates (from Roman Zippel):
  - Optimize find_{first,next}_zero_bit()
  - Add missing implementations of find_{first,next}_bit()

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga A2065 Ethernet: Add KERN_* prefixes to printk() messages

From: Maneesh Soni <maneesh@in.ibm.com>

Clarify some things which were confusing poeple...

From: Manfred Spraul <manfred@colorfullife.com>

Below is a patch that redefines the kmem_cache_alloc `align' argument:

- align not zero: use the specified alignment.  I think values smaller than
  sizeof(void*) will work, even on archs with strict alignment requirement (or
  at least: slab shouldn't crash.  Obviously the user must handle the
  alignment properly).

- align zero:
* debug on: align to sizeof(void*)
* debug off, SLAB_HWCACHE_ALIGN clear: align to sizeof(void*)
* debug off, SLAB_HWCACHE_ALIGN set: align to the smaller of
   - cache_line_size()
   - the object size, rounded up to the next power of two.
  Slab never honored cache align for tiny objects: otherwise the 32-byte
  kmalloc objects would use 128 byte objects.

There is one additional point: right now slab uses ints for the bufctls.
Using short would save two bytes for each object.  Initially I had used short,
but davem objected.  IIRC because some archs do not handle short efficiently. 
Should I allow arch overrides for the bufctls?  On i386, saving two bytes
might allow a few additional anon_vma objects in each page.

From: Paul Jackson <pj@sgi.com>

The #include of linux/module.h in several arch/*/mm/hugetlbpage.c files for
EXPORT_SYMBOL(hugetlb_total_pages) is now unneeded.

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

Doesn't compile with CONFIG_BLK_DEV_INITRD=n.  Be more careful with the
conditionals.

Spotted by Dave Boutcher...

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

This patch moves the initrd when "make_room" runs out of space, rather than
stepping over it.  The problem with stepping over it is that it gets copied
with the kernel when this happens, which wastes space.

Also ensures that the initrd isn't where the kernel wants to be moved to: if
it is, it gets moved out the way.

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

Clean up initrd handling.

1) Expose initrd_start and initrd_end to prom.c (replacing its local
   initrd_start and initrd_len).

2) Don't hand mem (aka klimit) through functions which don't need it.

3) Add more debugging under DEBUG_PROM in case we broke anything.

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

1) Define PROM_ERROR: checks for call_prom() < 0 are bogus (returns ulong)
2) All OF access functions should be marked __init.
3) prom_strtoul isn't used at all.

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

Ben Herrenschmidt made this actually boot.

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

copy_device_tree calls inspect_node() which recurses to copy the Open Firmware
device tree.  It just copied into memory above the kernel for about 8MB, which
can overwrite the initrd, and/or get truncated on big machines.

The real solution is to allocate memory properly for all the prom_init memory
users.  However, that's quite a change.  This patch introduces a "make_room"
macro which inspect_node uses to get memory.  This does the same as before,
except skips over the initrd if neccessary.

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

finish_device_tree simply allocates nodes by incrementing klimit (ie.  using
memory on top of the kernel).  Change it to figure out how much memory it
needs, then use lmb_alloc to allocate that, then fill it in.

This gets rid of the only manipulation of klimit after prom_init.

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

Rather than pre-declaring static functions, order them so it's not neccessary.
This makes the code easier to navigate and patch.

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

Rather than pre-declaring static functions, order them so it's not neccessary.
This makes the code easier to navigate and patch.