Merge branch 'akpm' (final batch from Andrew)

that the mapping code will work correctly on all dma implementations without

any dependency on the specifics of the underlying implementation. Using the

returned address without checking for errors could result in failures ranging

from panics to silent data corruption. Couple of example of incorrect ways to

check for errors that make assumptions about the underlying dma implementation

are as follows and these are applicable to dma_map_page() as well.

from panics to silent data corruption. A couple of examples of incorrect ways

to check for errors that make assumptions about the underlying dma

implementation are as follows and these are applicable to dma_map_page() as

well.

Incorrect example 1:

	dma_addr_t dma_handle;

		dma_unmap_single(dma_handle1);

	map_error_handling1:

Example 2: (if buffers are allocated a loop, unmap all mapped buffers when

Example 2: (if buffers are allocated in a loop, unmap all mapped buffers when

	    mapping error is detected in the middle)

	dma_addr_t dma_addr;

  modprobe ipmi_si.o type=<type1>,<type2>....

       ports=<port1>,<port2>... addrs=<addr1>,<addr2>...

       irqs=<irq1>,<irq2>... trydefaults=[0|1]

       irqs=<irq1>,<irq2>...

       regspacings=<sp1>,<sp2>,... regsizes=<size1>,<size2>,...

       regshifts=<shift1>,<shift2>,...

       slave_addrs=<addr1>,<addr2>,...

       force_kipmid=<enable1>,<enable2>,...

       kipmid_max_busy_us=<ustime1>,<ustime2>,...

       unload_when_empty=[0|1]

       trydefaults=[0|1] trydmi=[0|1] tryacpi=[0|1]

       tryplatform=[0|1] trypci=[0|1]

Each of these except si_trydefaults is a list, the first item for the

Each of these except try... items is a list, the first item for the

first interface, second item for the second interface, etc.

The si_type may be either "kcs", "smic", or "bt".  If you leave it blank, it

defaults to "kcs".

If you specify si_addrs as non-zero for an interface, the driver will

If you specify addrs as non-zero for an interface, the driver will

use the memory address given as the address of the device.  This

overrides si_ports.

If you specify si_ports as non-zero for an interface, the driver will

If you specify ports as non-zero for an interface, the driver will

use the I/O port given as the device address.

If you specify si_irqs as non-zero for an interface, the driver will

If you specify irqs as non-zero for an interface, the driver will

attempt to use the given interrupt for the device.

si_trydefaults sets whether the standard IPMI interface at 0xca2 and

trydefaults sets whether the standard IPMI interface at 0xca2 and

any interfaces specified by ACPE are tried.  By default, the driver

tries it, set this value to zero to turn this off.

The other try... items disable discovery by their corresponding

names.  These are all enabled by default, set them to zero to disable

them.  The tryplatform disables openfirmware.

The next three parameters have to do with register layout.  The

registers used by the interfaces may not appear at successive

locations and they may not be in 8-bit registers.  These parameters

   can use a remote server as one of its block devices. So every time

   the client computer wants to read, e.g., /dev/nb0, it sends a

   request over TCP to the server, which will reply with the data read.

   This can be used for stations with low disk space (or even diskless -

   if you boot from floppy) to borrow disk space from another computer.

   Unlike NFS, it is possible to put any filesystem on it, etc. It should

   even be possible to use NBD as a root filesystem (I've never tried),

   but it requires a user-level program to be in the initrd to start.

   It also allows you to run block-device in user land (making server

   and client physically the same computer, communicating using loopback).

   Current state: It currently works. Network block device is stable.

   I originally thought that it was impossible to swap over TCP. It

   turned out not to be true - swapping over TCP now works and seems

   to be deadlock-free, but it requires heavy patches into Linux's

   network layer.

   This can be used for stations with low disk space (or even diskless)

   to borrow disk space from another computer.

   Unlike NFS, it is possible to put any filesystem on it, etc.

   For more information, or to download the nbd-client and nbd-server

   tools, go to http://nbd.sf.net/.

   Howto: To setup nbd, you can simply do the following:

   First, serve a device or file from a remote server:

   nbd-server <port-number> <device-or-file-to-serve-to-client>

   e.g.,

	root@server1 # nbd-server 1234 /dev/sdb1

	(serves sdb1 partition on TCP port 1234)

   Then, on the local (client) system:

   nbd-client <server-name-or-IP> <server-port-number> /dev/nb[0-n]

   e.g.,

	root@client1 # nbd-client server1 1234 /dev/nb0

	(creates the nb0 device on client1)

   The nbd kernel module need only be installed on the client

   system, as the nbd-server is completely in userspace. In fact,

   the nbd-server has been successfully ported to other operating

        mount -t cgroup -o blkio none /sys/fs/cgroup/blkio

- Specify a bandwidth rate on particular device for root group. The format

  for policy is "<major>:<minor>  <byes_per_second>".

  for policy is "<major>:<minor>  <bytes_per_second>".

        echo "8:16  1048576" > /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device

	   X:	net/ipv6/

	   matches all files in and below net excluding net/ipv6/

	K: Keyword perl extended regex pattern to match content in a

	   patch or file.  For instance:

	   patch or file, or an affected filename.  For instance:

	   K: of_get_profile

	      matches patches or files that contain "of_get_profile"

	      matches patch or file content, or filenames, that contain

	      "of_get_profile"

	   K: \b(printk|pr_(info|err))\b

	      matches patches or files that contain one or more of the words

	      printk, pr_info or pr_err

	      matches patch or file content, or filenames, that contain one or

	      more of the words printk, pr_info or pr_err

	   One regex pattern per line.  Multiple K: lines acceptable.

Note: For the hard of thinking, this list is meant to remain in alphabetical

NETWORK BLOCK DEVICE (NBD)

M:	Paul Clements <Paul.Clements@steeleye.com>

S:	Maintained

L:	nbd-general@lists.sourceforge.net

F:	Documentation/blockdev/nbd.txt

F:	drivers/block/nbd.c

F:	include/linux/nbd.h

M:	Julian Andres Klode <jak@jak-linux.org>

M:	Marc Dietrich <marvin24@gmx.de>

L:	ac100@lists.launchpad.net (moderated for non-subscribers)

L:	linux-tegra@vger.kernel.org

S:	Maintained

F:	drivers/staging/nvec/

Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git

S:	Supported

F:	arch/arm/mach-tegra

F:	arch/arm/boot/dts/tegra*

F:	arch/arm/configs/tegra_defconfig

K:	(?i)[^a-z]tegra

TEHUTI ETHERNET DRIVER

M:	Andy Gospodarek <andy@greyhouse.net>