into ppc970.osdl.org:/home/torvalds/v2.6/linux

into sgi.com:/source2/xfs-linux-2.6

SGI Modid: xfs-linux:xfs-kern:170489a

SGI Modid: xfs-linux:xfs-kern:170509a

SGI Modid: xfs-linux:xfs-kern:170448a

From: Tom Rini <trini@kernel.crashing.org>

This patch updates support for the Motorola PrPMC750 platform.  Most of the
size in this patch comes from merging prpmc750_pci.c and prpmc750_setup.c into
just prpmc750.c.

From: Tom Rini <trini@kernel.crashing.org>

This patch adds openpic_hookup_cascade(offset, name, handler) which allows for
an arbitrary interrupt controller to be hooked up as a cascade to the openpic.
 This also allows for platforms to just not have a cascaded controller.

From: Tom Rini <trini@kernel.crashing.org>

This patch updates support for the SBS K2 platform.  Most of the size in this
patch comes from merging k2_pci.c and k2_setup.c into just k2.c.

From: Christoph Hellwig <hch@lst.de>

asm-ppc/elf.h uses a pointer to struct task_struct without any
forward-declaration.

In file included from include/linux/elf.h:5,
                 from arch/ppc/boot/simple/misc.c:20:
include/asm/elf.h:102: warning: `struct task_struct' declared inside parameter list
include/asm/elf.h:102: warning: its scope is only this definition or declaration, which is probably not what you want

From: Tom Rini <trini@kernel.crashing.org>

And when trying to catch up on old patches, I forgot this hunk:

From: Tom Rini <trini@kernel.crashing.org>

When I changed some '#if FOO' tests to '#ifdef FOO' I forgot to make sure
that nothing was doing #define FOO 0.  So after auditing all of the changes
I made, the following is needed:

From: Olof Johansson <olof@austin.ibm.com>

On pSeries LPARs we might end up with NUMA nodes that only have memory and
no CPUs.  Only the CPU configuration code actually set a node online, so
memory-only nodes wouldn't show up in sysfs.  Below patch adds the
set_online call to the memory loop too.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

fs/dquot.c: In function `vfs_quota_off':
fs/dquot.c:1328: warning: label `out' defined but not used

into lips.borg.umn.edu:/export/music/bkroot/xfs-linux-2.6

Can't use _ffs() without first checking for zero, and if bits beyond
NR_CPUS set it'll give bogus results.  Use find_first_bit

into ppc970.osdl.org:/home/torvalds/v2.6/linux

We cannot always rely on ->biotail remaining untouched. Currently we
leak all the pinned user pages when doing cdda ripping at least, so I
see no way around keeping the bio pointer seperate and passing it back
in for unmap. Alternatively, we could invent a struct blk_map_data and
put it on the stack for passing to both map and unmap.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

An unintentional sign extention caused non-ascii characters to be
stored incorrectly, leading to inaccessible files.  Changing a
declaration to unsigned char fixes the problem.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

From: Sam Ravnborg <sam@ravnborg.org>

The external module support recently introduced caused a number of problems:
- To build an external module the Module.symvers file was needed
- To create the Module.symvers file a module was required
- If Module.symvers was missing kbuild boiled out with an error
- If vmlinux was missing also the stage 2 of module build failed (make -k)
- It was not documented what was needed to actually bauild a module

The following patch addresses this by adding the following functionality:
- Always generate the Module.symvers file
- Ignore a missing Module.symvers file
- Add a new target modules_prepare, it prepares the kernel for building
  external modules, and is also usefull with O=
- And it adds some more comments to Makefile.modpost, so others may follow
  it with some luck
- .modpost.cmd is no longer generated

This should close all reports on issues with respect to building external
modules with current kernel - which has been identified as kernel problems.

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

kernel-parameters.txt: add info on how to specify loadable module
parameters vs.  built-in module parameters

From: Stephen Smalley <sds@epoch.ncsc.mil>

Looking again at the SELinux ptrace check, I believe that there is an
unrelated race due to the fact that the parent link is only updated after
releasing the task lock in ptrace_attach (and this is necessary as task lock
doesn't nest with write lock of tasklist_lock).

The patch below changes SELinux to save the tracing process' SID upon a
successful selinux_ptrace hook call and then use that SID in the ptrace check
in apply_creds in order to avoid such races.  This allows us to preserve the
fine-grained process-to-process ptrace check upon exec (vs.  the global
CAP_SYS_PTRACE privilege => PT_PTRACE_CAP flag used by the capability module)
while still avoiding races.

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.