From: Maneesh Soni <maneesh@in.ibm.com>

The sysfs_rename_dir() interface was changed recently but I forgot to
change the definition if CONFIG_SYSFS is not defined.

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

into redhat.com:/spare/repo/libata-2.6

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

into redhat.com:/spare/repo/i810-audio-2.6

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

Patch from Tony Lindgren

This patch makes the low level debug functions work when support is
compiled in for multiple OMAPs. The patch also removes now unnecessary
include, incorrect comment, and SERIAL_REG_SHIFT ifdefs.

Patch from Tony Lindgren

This patch syncs the mainline kernel with the linux-omap tree.
The highlights of the patch are:
- Changed the BOOT_MEM() to use the new IO address (Tony Lindgren)
- Cleaned up interrupt handler (Juha Yrjölä)
- DMA channel linking for 1610 (Samuel Ortiz)
- GPIO fixes (Juha Yrjölä)
- IRQ fix for OMAP-730 (Kevin Hilman)
- OMAP-1510 FPGA interrupt fix (Dirk Behme)
- OMAP-1610 voltage change settings (Todd Poynor)
- Uncompress kernel serial output fixes (Tony Lindgren)

Patch from Tony Lindgren

This patch syncs the mainline kernel with the linux-omap tree.
The highlights of the patch are:
- Changed the BOOT_MEM() to use the new IO address (Tony Lindgren)
- Cleaned up interrupt handler (Juha Yrjölä)
- DMA channel linking for 1610 (Samuel Ortiz)
- GPIO fixes (Juha Yrjölä)
- IRQ fix for OMAP-730 (Kevin Hilman)
- OMAP-1510 FPGA interrupt fix (Dirk Behme)
- OMAP-1610 voltage change settings (Todd Poynor)
- Uncompress kernel serial output fixes (Tony Lindgren)

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

Patch from Nicolas Pitre

Since the iWMMXt patch (#1866/1) requires more time to be reviewed,
this patch will allow merging Mainstone patches without breaking
anything if iWMMXt support isn't merged yet.
Should be applied after patch #1867/1.

Patch from Nicolas Pitre

Patch from Nicolas Pitre

Patch from Nicolas Pitre

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

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

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

This re-applies the separation of the ramdisk blockdev inode
backing store and the files that live in the ramdisk.

Cset exclude: torvalds@ppc970.osdl.org|ChangeSet|20040521210025|21437

Sigh.  ramdisk almost works, except it loses data on umount.

This is because the files which are atop the ramdisk do not contribute to
dirty memory accounting, but they do need writeback.  So when sync() calls
sync_inodes_sb() to do the work, sync_inodes_sb() hopelessly underestimates
the number of pages which need writeback for a complete sync.

If you run `sync' enough times, everything eventually hits "disk" and all is
happy.

The root cause here is that the ramdisk and the files which it hosts shared
the same backing_dev_info.  This is inappropriate because the hosted files
*do* want to writeback and really should contribute to dirty memory
accounting. But the ramdisk inode itself wants neither.

So.  The patch sets up the infrastructure which permits a blockdev to provide
a separate backing_dev_info for the files which it hosts.  It's a bit of a
ramdisk-special.

doing a mod_timer on a live state without holding a lock or for that
matter not even checking whether the state is dead is definitely a bad
idea

Right now we ignore it, but we need to pass this down
to the low-level filesystems if we want to ever make
knfsd create symlinks with different permissions correctly.

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

- add module support code
- add H8/300 ELF infomation
- fix kcore ELF format

- new config items
- interface setup
- io cleanup

- config symbol fix

The code was incomplete. Let's re-do it when the other pieces
are in place.

Cset exclude: akpm@osdl.org[torvalds]|ChangeSet|20040521202003|24125

From: Andrea Arcangeli <andrea@suse.de>

this fixes the 2G limit on ramfs

From: Andrew Theurer <habanero@us.ibm.com>

Use num_online_cpus in smp_init instead of counting cpus which may or may not
really be brought up.

From: Roger Luethi <rl@hellgate.ch>

Make the comments in drivers/base/power/shutdown.c somewhat less wrong. 
There's still room for improvement :-/.

From: David Mosberger <davidm@napali.hpl.hp.com>

It used to be that loops_per_jiffy was a macro on ia64, hence it couldn't be
exported.  That's no longer the case though, so there is no point in
inhibiting its export (not that it makes any _sense_ to export that value on
ia64).

From: Rusty Russell <rusty@rustcorp.com.au>

Matthieu Castet <castet.matthieu@free.fr> pointed out that testing
cpu_online(cpu) on a UP system goes BUG().

That's because you're never supposed to ask cpu_online() about a CPU which
is >= NR_CPUS.  msr and cpuid devices use the minor to indicate the CPU
number.  Oops.

Fix is to explicitly test cpu < NR_CPUS.  Using cpu_online() is OK;
although the CPU might go down before you actually read the file, that will
simply cause junk to be returned.

A few things which Lindent got wrong.

From: Rusty Russell <rusty@rustcorp.com.au>

From:  Pavel Machek <pavel@ucw.cz>

This patch fixes init section usage in swsusp.c: "read_suspend_image()" can
be __init.

From: Rusty Russell <rusty@rustcorp.com.au>

From:  Stephen Leonard <stephen@phynp6.phy-astr.gsu.edu>

This fixes a counter that is unnecessarily incremented in build_zonelists().