From: Trivial Patch Monkey <trivial@rustcorp.com.au>

From:  Omkhar Arasaratnam <omkhar@rogers.com>

From: Trivial Patch Monkey <trivial@rustcorp.com.au>

From:  Pavel Machek <pavel@ucw.cz>

I was sending this to users that had problems with swsusp, then lost it.  It
would be nice to have it directly in the tree.

From: Trivial Patch Monkey <trivial@rustcorp.com.au>

From:  Pavel Machek <pavel@ucw.cz>

acpi_sleep option should be documented.

From: Trivial Patch Monkey <trivial@rustcorp.com.au>

From:  Omkhar Arasaratnam <omkhar@rogers.com>

check_region() fix

From: Willem Riede <wrlk@riede.org>

The patch revises the error handling in ide-scsi, fixing the scheduling
while locked issues, and make it work properly, at least for me...

Specific changes in this patch:

- introduce idescsi_expiry, a timeout routine for the ide subsystem,
  which simply flags the fact that the command timed out, but postpones
  any other action until either the command still finishes on its own
  (unlikely?) or the scsi error handler kicks in;

- introduce idescsi_atapi_error and idescsi_atapi_abort, error routines
  for the ide subsystem, which are modeled after those of ide-cd, but
  take only minimal effort to recover, leaving the heavy lifting for
  the scsi error handler;

- rewrite (and rename for clarity) idescsi_eh_abort and idescsi_eh_error,
  the abort/error routines to be called by the scsi error handler --
  this redesign should not have the scheduling while atomic problems
  of the old implementation.

- move ide_cdrom_dump_status() from ide-cd.c to ide-lib.c as
  ide_dump_atapi_status() and both ide-cd and ide-scsi call it.

- replaces BUG() by WARN_ON()/printk in the error handling code.

- sets TASK_UNINTERRUPTIBLE before schedule_timeout() and moves the host
  unlock/lock around the while loop inside the loop in idescsi_eh_reset().

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

This patch extends the SELinux policy engine to support conditional policy
logic based on a set of policy booleans, allowing well-formed changes to
the policy to be defined within and mediated by the policy itself.

The conditional policy extensions were implemented and contributed by
Tresys Technology.

Userland packages that support these extensions are already available from
nsa.gov/selinux, and backward compatibility is provided for the prior
policy version.

The patch also includes a small change to enable detection of the optional
MLS policy model on a SELinux system and fixes to the conditional policy
extensions to allow the MLS policy to work correctly with them that were
implemented and contributed by Trusted Computer Solutions.

From: Gerald Schaefer <gerald.schaefer@gmx.net>

Update s390 to track the new fields in struct page_state.

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

The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a
useless keyword, and should just be removed from include/asm-ppc/unistd.h.

From: Andi Kleen <ak@suse.de>

This patch saves 2MB of memory on a 1GB x86-64 machine, 20MB on a 10GB
machine.  It does this by eliminating 8 bytes of useless padding in struct
page.

This resurrects an older patch in a hopefully cleaner form.

From: Sam Ravnborg <sam@ravnborg.org>

Ingo said:

  Starting at around 2.6.4-rc2-mm1, I keep seeing 'scripts/fixdep: Text
  file busy' messages when doing a -j10 bzImage build - which seems to
  suggest that by the time fixdep is used by the build system it's not
  built yet.

Sam said:

I was pretty sure it was something I had caused, so I gave it a spin.  What
actually happened was that we tried to build the target 'silentoldconfig'
in parrallel with 'scripts'.  Since 'silentoldconfig' started a new make
and then the config target needed 'scripts' we saw two parallel runs.

The way I decided to fix it was to split scripts/ in two parts.  The first
part is now the very basic stuff - moved to scripts/basic/.  The second
part is dependent on kernel config etc.  and kept in scripts/

In the 2.7 timeframe i will redo this initial stuff - it's becoming too
messy for anyone to understand today.


Description:

Fix dependencies in early phases of kernel build.  This solves a few
problems nively: modpost is no longer rebuild twicewhen reaching the
'target' state 'make -j10' now works nicely again

The patch is rather large due to the following file moves:
mkdir scripts/basic
mv scripts/fixdep.c        scripts/basic
mv scripts/split-include.c scripts/basic
mv scripts/docproc.c       scripts/basic

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

The g5 iommu code would fill the "iommu_table" member of whatever
device node was pointed to by pcidev->sysdata during boot. However,
the ppc64 kernel fills that with a pointer to the PHB node which is
later replaced "lazily" with a pointer to the real node when calling
pci_device_to_OF_node(). In this case, we were thus "losign" the
iommu_table pointer. Typical symptom: loss of the SATA when looking
at it's /proc entry.

This fixes it by forcing the update to the final sysdata pointer
when filling up the iommu_table pointers. The "lazy" thing is useless
on pmac anyway.

SN2 platforms provide oemdata in salinfo records.  The decode of that
oemdata is done via prom routines.  This patch provides the interface
from user space through the kernel into the prom to do the oem decode.

Apparently GCC sometimes fails to insert a stop-bit when re-using p14
after the spinlock directives, even though the register is clearly marked
as "clobbered".

Use the proper (and cleaner) probing API instead of the old
scsi_module.c hack, don't use the typedefs I plan to kill in 2.7 and
mark everything static

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

This Kconfig patch basically just makes ia64 look a little more like i386:
        - moves system type above processor type
        - moves PM & ACPI to a new top-level menu
        - moves PCI/PCMCIA to a new top-level menu

See this ChangeSet:

http://lia64.bkbits.net:8080/linux-ia64-2.4/cset@40524248tkgE0RDYQL0IyiAdFxo_Ew

The MCA code is now slim enough that there isn't much point in keeping
CONFIG_IA64_MCA anymore.

The patch that moved and renamed consistent_dma_mask neglected
to fix up arch/ia64/hp/common/sba_iommu.c.

The last mod to fix the staircase printing - missed some bracing...

This fixes the CONFIG_DEBUG_INFO build on x86-64 (there were missing
.cfi_endprocs)

Also some minor cleanup in the exception stack handling.

There's an error in sys_swapon() that can cause slab corruption if you
pass in a bad specialfile pointer. getname() then returns
ERR_PTR(-EFAULT), but sys_swapon() doesn't clear name before calling
putname() on it (thus freeing 0xfffffff2, corrupting slab). An ltp test
case repeatedly crashed in later tests due to thus, irk.

This bug was discussed on linux-scsi a few weeks back, but it appears to
have slipped through the cracks. This fix was originally proposed by
Christoph Hellwig, but I am reposting it, since I have the hardware :-)

Anyway, the problem that this fixes is that megaraid doesn't set the
moduler owner for the host_template, this means that the module can be
removed, even when it is in use.

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

If the driver fails to load, we leave a 3c509 eisa directory
in sysfs.

No code changes, but lots of trivial whitespace cleaning, and
removal of a bogus set of 'defaults' at the bottom of the file.

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

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

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

Patch from Adrian Bunk

Patch from Bjorn Helgaas

ACPI and HCDP tell us what IRQ the serial port uses, so there's
no need to have the driver probe for the IRQ.

Patch from Steve Youngs

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

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