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

From:  a.othieno@bluewin.ch (Arthur Othieno)
From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

Remove various duplicated #includes

From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

        Use mod_timer in drivers_block_floppy98.c

From:  carbonated beverage <ramune@net-ronin.org>

        doc update for bk usage
        bk://... appears to be dead, use http://... instead.

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

From:  Adam Lackorzynski <adam@os.inf.tu-dresden.de>

dma_map_page() can be simplified by using page_to_phys instead of writing the
calculation explicitly.

From: James Simmons <jsimmons@infradead.org>

This fixes the bugs that where in mode switch via stty.

The problem was we couldn't set the mode just by using the x and y
resolution.  We use modedb to fill in the rest.  There also was a bug that
allowed you to change the console resolution for drivers with fixed
resolutions.  This would mess up your display.  Now that is fixed.

From: Andi Kleen <ak@suse.de>

sys_sendfile has a hardcoded 2GB limit.  64bit architectures should
probably always use sys_sendfile64() in their native system tables, because
for them sizeof(off_t) == sizeof(loff_t).  This patch does this.  It seemed
easier to just change the 64bit entry tables instead of fixing up all the
emulation layers to do 2GB checks on their own.

I changed all 64bit architectures except for parisc64, which seemed to
already have a sendfile64.

From: Olaf Hering <olh@suse.de>

This one allows console autodetection for powermacs.

From: "J. Bruce Fields" <bfields@fieldses.org>

Older gcc's don't like that dimensionless array.  Remove it in favour of a
pointer to the data.

drivers/video/vga16fb.c:1350: warning: assignment makes pointer from integer without a cast

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.