From: Anton Blanchard <anton@samba.org>

From: Stephen Rothwell <sfr@canb.auug.org.au>

This creates DMA_ERROR_CODE and uses it everywhere instead of
PCI_DMA_ERROR_CODE as we really want the three DMA mapping API's to return
a single error code.  Also we now have dma_mapping_error and
vio_dma_mapping_error - and this latter and pci_dma_mapping_error both just
call the former.

Also a small fix in the vscsi - dma_map_sg returns 0 to indicate an error.

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

This fixes the build on non cache coherent PPC32 platforms.

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

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

into austin.ibm.com:/shaggy/bk/jfs-2.5

into kernel.bkbits.net:/home/davem/net-2.6

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

estimate.  We must add in for the worst case of a log stripe taking us the
full distance for a log stripe boundary.

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

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

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

else we panic.

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

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

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

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

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

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

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

feature bit in sb_versionnum to use to indicate that the new feature bit
field is to be used.

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

Add XFS_ALLOCFREE_LOG_RES to IFREE log reservation.

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

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

previously saved FSTRANS state.  Otherwise we can lose process flags.

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

take the iolock here, and readers no longer conflict with concurrent
fsync activity.  Kudos to Steve!

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

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

People need the global wake events even when not sleeping:
they are used for lid open events at least on some laptops.
As such, they should be enabled by default.

You can disable them with "acpi_leave_gpes_disabled" if
your machine doesn't need them, and you want to get a few
less GPE's.

Spotted by Suparna: if the first range check fails, we leak a ref on the io
context.

Currently, to be able to send a reset in the FORWARD chain of iptables
for bridged traffic, ip forwarding must be enabled. This causes confusion
and in some situations people really don't want to enable ip forwarding.
The patch below lets the user send reset packets for bridged frames in
the FORWARD chain, with ip forwarding disabled (as long as there is a
route).

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

In the ALSA cleanup for duplicate PCI ID's, they weren't exactly
duplicated, resulting in problems in the au8810.c driver.

This fixes the problem

into nuts.davemloft.net:/disk1/BK/sparc-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

The last fix apparently only worked for device 0, since the driver
screwed up the port offsets (due to a wonky VIA hardware layout,
really). 

This patch fixes device 1 detection for the users still seeing problems
in -rc3.

In both uniprocessor and SMP, the fealnx driver's TX-submit path can 
race against the interrupt handler, with disastrous results.  Add the
lock that needed to be there all along, to fix this.

There's another problem in the RX path, that will be sent as a separate 
patch, as soon as we get that patch 100% nailed down, and acceptable for
a Release Candidate.

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

Every pointer in <syscalls.h> had better be a user
pointer. Also add some others that a quick sanity check
picked up on.

This cleans up a larger amount of superfluos ";;" statements in current
Linux kernel sources by converting them to the regular single ";"
statments.

It seems to be a common problem that at the end of a line the semicolon
key is producing an echo.