From Matthew Dobson.

Leaves any functions which architectures haven't defined as undefined,
rather than using non-NUMA functions where users would expect
NUMA-functions.

This will cause compilation errors if someone tries to use an undefined
function, hopefully causing them to actually define those functions.

Also removes lingering topology-like macros that aren't being used, and
a couple typo fixes.

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

"This patch adds a 'simple' in-kernel topology API.  This API allows
 for three primary topology elements: CPUs, memory blocks, and nodes.
 The API allows for the discovery of which CPUs/Memory Blocks reside on
 which nodes, and vice versa.  Also implemented is a macro to get a
 bitmask of CPUs on a particular node.  This API is platform neutral."

We need this API for per-node-kswapd - without it there is no means by
which each kswapd can be bound to its node's CPUs.  And we rather need
per-node-kswapd...

The patch also uses the new API to bind each kswapd instance to its
node's CPUs

Patch from David Hansen.

Start one kswapd instance for each NUMA node.  That kswapd instance
only works against the pages which are local to that node.

We need to bind that kswapd to that node's CPU set, but the
infrastructure for this is not yet in place.

typedef eradication.

From David Hansen, Bill Irwin, Martin Bligh.

"It's easier to cat /proc/buddyinfo than to beg users to press
 shift-scrolllock on a machine millions of miles away.  Order 1 and 2
 memory allocations are common.  Memory fragmentation is a problem
 under some workloads, and this is a useful tool for helping diagnose
 these problems."

The following patch exports some information about the buddy allocator.

Each column of numbers represents the number of pages of that order
which are available.  In this case, there are 5 chunks of
2^2*PAGE_SIZE available in ZONE_DMA, and 101 chunks of 2^4*PAGE_SIZE
availble in ZONE_NORMAL, etc...  This information can give you a good
idea about how fragmented memory is and give you a clue as to how big
an area you can safely allocate.

Node 0, zone      DMA      0      4      5      4      4      3 ...
Node 0, zone   Normal      1      0      0      1    101      8 ...
Node 0, zone  HighMem      2      0      0      1      1      0 ...

GFP_NFS has been obsolete for a while now.  Kill its only remaining
user, its definition and the SLAB_NFS define too.

From Zach Brown.  Lots of places forget to initialise list_heads in
vm_area_structs, and other places then go and test the state of those
list_heads.

Plug the gaps for now, Zach is working on a broader cleanup.

move_one_page() is calling alloc_one_pte_map() while holding an atomic
kmap for the source pte's page.  But alloc_one_pte_map() can sleep in
the page allocator.

So change move_one_page() to take a peek at the destination pagetables
to work out whether the alloc_one_pte_map() will need to perform page
allocation.  If so, drop the atomic kmap and retake it after allocating
the pte.

From David Miler.

get_user_pages() needs to avoid running page_cache_get() against
PageReserved pages.  Things like video driver and audio driver
remap_page_range() mappings.

From Rohit

Creates Documentation/vm/hugetlbpage.txt

Slab currently has a policy of buffering a single spare page per slab.
We're putting that on the partially-full list, which confuses
kmem_cache_destroy().

So put it on cachep->slabs_free, which is where empty pages go.

- Dave says that lock_sock() inside locks is a popular bug.  Put a
  check there.

- Also in wait_for_completion().

- Add the text "Debug" to the warning message so people are less
  likely to think that they've oopsed.

This contains the following changes for the SCSI tape driver in 2.5.39:
- move driverfs file creation and removal outside the st_dev_arr_lock
  spinlock
- change page pointer array allocation from GFP_ATOMIC to GFP_KERNEL

+ Fixes 2 cases caught by might_sleep testing.
+ Replace sleep_on with wait_event.
+ MOD_INC_USE_COUNT to prevent module unload vs smbiod thread exit race.

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

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

Adds machine specific support for Ceiva Photoframe. Affects:
arch/arm/mach-clps711x/Makefile 
arch/arm/mach-clps711x/ceiva.c (new)
include/asm-arm/arch-clps711x/hardware.h
include/asm-arm/arch-clps711x/memory.h

Differences from 1st patch:
Removed redundant static I/O mapping for flash from hardware.h
Reverted to original CONFIG_DISCONTIGMEM enabling in memory.h
Added PHYS_TO_NID definition, when DISCONTIG undefined in memory.h

(From Thunder)

Two bugs here:

1) The return value of strchr("foo",0) should be the start address of
   "foo" + 3, not NULL.

2) Since the second argument for strchr() is defined as an int, some
   characters such as 'é' might validly end up to be the value -23 due to
   signedness issues.  Corectly handle those.

The return value from ptrace_set_bit() is never used.  This cset
makes it a void function.

This removes some minor differences between Linus' tree and the main
ARM tree; comment clarification and some weird formatting.

This keeps ARM in line with the continued transition to the input
layer.

Hi,
  I believe the comment in the nwfpe fpopcodes is slightly wrong -
although a 2nd pair of eyes on this would be a good idea.

Hi,
  For reasons of great complexity I found out the hard way that the
kernel must (and does) zero the pad sections in the stat structures.
Here is a comment that states this for the next person who needs to
know.

This allows the FP module to perform some extra optimisations.

Update for changes in mainline 2.5.3[01234].

This patch adds symlinks, hardlinks, device nodes, uid/gid, unix
permissions vs servers that support it (ie samba). Most of this is the
work of John Newbigin, I just modified it for 2.5.

There are issues with what samba allows (eg you can't make arbitrary
symlinks) and room for improvements (use the servers value for ino?). But
it doesn't affect "normal" users.

smbfs wants a wait_event_interruptible_timeout to be able to replace
interruptible_sleep_on_timeout.

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

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make

(slightly modified to unconditionally add the relative path to the subdir)

Rusty Russel wrote:

"M-x compile" in emacs stars a compilation and can jump to the next
error.  With KBUILD_VERSBOSE=0 (as I have in my env, great work Kai)
it can't figure out the directory, since it doesn't see the make[XXX]
markers.

This makes it work.

by Aristeu Sergio Rozanski Filho

Currently, scripts/Configure has code for the 'int' verb to take a
min/max.  This violates the spec described in
Documentation/kbuild/config-language.txt.  It also requires that if a
default is outside of +/- 10,000,000 that defaults be provided, or
'config' and 'oldconfig' will get stuck.  The following removes the
support for a min/max from scripts/Configure.

(by Tom Rini)