Update acornscsi.c for host/device structure changes.
Clean up scsi_pointer initialisation.

In addition, remove some unnecessary definitions from cache.h

Wait for BSY bit to be asserted before returning from
ssp_write_word().  This ensures that ssp_flush() will wait for
the transmitter to empty before returning.

Add ssp.h header.

CLPS7500 had lacked behind slightly; this cset brings it back up to
date.

Timer interrupts run with IRQs disabled, so this is
unnecessary.

Fixup functions need to be __devinit, not __init for cardbus to work.
Convert ARM to setup bridge windows and resources on a per-bus basis,
and call pci_bus_add_devices() once everything is setup.

into kroah.com:/home/greg/linux/BK/gregkh-2.5

This is a fix made almost a month ago, during the flurry of signal changes.
I didn't realize until today that this hadn't made it into 2.5.  Sorry
about the delay.

This fix is necessary to avoid sometimes wedging in uninterruptible sleep
when doing a multithreaded core dump triggered by a process signal (kill)
rather than a trap.  You can reproduce the problem by running your favorite
multithreaded program (NPTL) and then using "kill -SEGV" on it.  It will
often wedge.  The actual fix could be just a two line diff:

+                       if (current->signal->group_exit)
+                               goto dequeue;

after the group_exit_task check.  That is the fix that has been used in
Ingo's backport for weeks and tested heavily (well, as heavily as core
dumping ever gets tested, but it's been in our production systems).

But I broke the hair out into a separate function.  The patch below has the
same effect as the two-liner, and no other difference.  I have tested
2.5.64 with this patch and it works for me, though I haven't beat on it.

The way the wedge happens is that for a core-dump signal group_send_sig_info
does a group stop of other threads before the one thread handles the fatal
signal.  If the fatal thread gets into do_coredump and coredump_wait first,
then other threads see the group stop and suspend with SIGKILL pending.
All other fatal cases clear group_stop_count, so this is the only way this
ever happens.  Checking group_exit fixes it.  I didn't make do_coredump
clear group_stop_count because doing it with the appropriate ordering and
locking doesn't fit the organization that code.

Mounting a non-affs filesystem as affs crashes the kernel.
The reason is the
	sbi = kmalloc(sizeof(struct affs_sb_info), GFP_KERNEL);
	memset(sbi, 0, sizeof(*AFFS_SB));
where the second sizeof is 1, so that sbi is not zeroed at all.

Also, avoid a warning for printk of sector_t in amigaffs.h.

Previously, we only honored barriers wrt merging. Really honor them now,
move all pending requests to dispatch list and add the hard barrier at
the back.

gen-asm-offsets, the most common user of the new filechk function, needs
to be fed input from $< (the first prerequisite).

into kroah.com:/home/linux/linux/BK/gregkh-2.5

Patch from Adrian Bunk <bunk@fs.tum.de>

It would be nice if everyone would try to compile the patched files
before submitting patches...

raid0 doesn't have a thread, so md_wakeup_thread() derefs NULL.

Neil may end up doing this differently, but meanwhile....

Patch from Roman Zippel <zippel@linux-m68k.org>

- remove lock_kernel() (It was buggy too - there are at present two missing
  unlock_kernel()s)

- fixes a bitmap corruption problem.

From latest -aa kernels.

Patch from: Suparna Bhattacharya <suparna@in.ibm.com>

Just an obvious fix.
The kiocbClearX macros were doing a set_bit !
They should be calling clear_bit.
Ran into this now that I'm actually using kiocbClearKicked.

Patch from Alex Tomas <bzzz@tmi.comex.ru>

There is a logic error in ext2_new_block().  If we manage to reserve some
blocks in the final blockgroup, local variable `bit' will be equal to
sbi->s_groups_count and we erroneously assume that the allocation failed.

Fix that up by testing local variable `group_alloc' instead.

Patch from "Theodore Ts'o" <tytso@mit.edu>

I recently noticed a bug in ext2/3; newly created inodes which inherit
the noatime flag from their containing directory do not respect noatime
until the inode is flushed from the inode cache and then re-read later.
This is because the code which checks the ext2 no-atime attribute and
then sets the S_NOATIME in inode->i_flags is present in
ext2_read_inode(), but not in ext2_new_inode().

I fixed this in 2.4, and then found an even worse bug in the 2.5 code;
the DIRSYNC flag is completely ignored *except* in the case where a
directory is newly created using mkdir and its parent directory has the
DIRSYNC flag.  S_DIRSYNC doesn't get set in the ext2_new_inode() or the
ext2_ioctl() paths (which is used by chattr).

This patch centralizes the code which translates the ext2 flags in the
raw ext2 inode to the appropriate flag values in inode->i_flags in a
single location.  This fixes the bug, makes things cleaner, and also
removes 30 lines of code and 128 bytes of compiled x86 text in the
bargain.

Patch from Oleg Drokin <green@linuxhacker.ru>

    There is a memleak in e100 driver from intel, both in 2.4 and 2.5
    e100_ethtool_gstrings does not free "strings" variable if it cannot
    copy it to userspace.

Patch from Anders Gustafsson <andersg@0x63.nu>

We're getting a division-by-zero in the writeback code during early rootfs
population, because writeback has not yet been initialised.

Fix that by performing an explicit initialisation rather than relying on
initcall ordering.

Patch from Kevin Pedretti <pedretti@ieee.org>

The previous fix for unmapping hugetlb regions could still produce incorrect
alignments if the munmap request covers multiple VMA's.

Fix it by always unmapped the entire hugepage VMA inside the inner loop.

Patch from "Randy.Dunlap" <rddunlap@osdl.org>

Reverts the recent alteration of the format of the `mem=' option.  This is
because `mem=' is interpreted by bootloaders and may not be freely changed.

Instead, the new functionality to set specific memory region usages is
provided via the new "memmap=" option.

The documentation for memmap= is added, and the documentation for mem= is
updated.

The recent (untested?) "cleanup" removed a null-pointer test.

into home.transmeta.com:/home/torvalds/v2.5/linux

As requested by Andrew, this moves the hugetlbfs config option
into the Pseudo filesystems section near tmpfs.

Also fix some spelling.

into home.transmeta.com:/home/torvalds/v2.5/linux

Patch from Ivan Kokshaysky

This fixes long standing typo ('size' instead of 'r_size') which causes
overestimate of the bridge memory ranges calculated in pbus_size_mem().
For example, if we have a device with one 1Mb and one 2Mb memory ranges
behind the bridge, calculated size and alignment of the bridge memory
window will be 4Mb and 2Mb respectively, while the correct values are
3Mb and 1Mb.

In an attempt to "unuse" pci_do_scan_bus() so it can be eventually
killed, make pci_scan_bus_parented() call the new pci_scan_child_bus()
and pci_bus_add_devices().  The only remaining callers are the
hotplug drivers.

Eventually, pci_bus_add_devices() will be removed from this function -
it is intended that architectures should call this after they have
done any setups and fixups to the scanned bus.

It is legal to call pci_bus_add_devices() on a bus which has already
had this function called, so architectures could update today.