The BK merging was a little too smart for the conflicting changes.
Add back what we lost with the last changeset.

We need to sync the blockdevice mapping at umount although sync_blockdev
already does it as we need to make sure everything hits the disk before
we mark the superblock clean.

Found by Dave Kleikamp.

Change __get_metapage to use the block device mapping to back metapages
that are addresses by filesystem relative blocks.  Remove all code to
implement the JFS-private per-filesystem mapping and fake inode.

JFS/Linux implements resizing by remount.

I don't know if the current form is harmless or not, but it is
definitely incorrect.  The patch below corrects the compile failure, as
well as the multi-statement macro defines used in bare if statements;
please apply.

The BUG_ON(p->ptrace) will be called if the CLONE_DETACH process is
traced.  This patch removes BUG_ON(p->ptrace), and also removes a
workaround for it in sys_wait4().

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

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5

- Update for PCI config space access api changes
- Handle new do_fork args
- Delete SET/CLEAR TID handling from copy_thread
- Update arch/sparc64/defconfig

know the floppy driver is busy.

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

driver remove the ftont of the queue from the request list
and cache it in 'current_req'.

This simplifies the driver and should be a lot more robust.

Still, I'll probably go blind just for _looking_ at the dang
sources of this thing. Whee.

pointer before the device is opened.

This should finally fix the 2.5.x floppy driver.

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

This fixes the pnpbios CS check to check for the correct values (it
wasn't up to date with the various GDT reshuffles), moves it inside the
kernel mode check, modifies it so that it takes less instructions and
marks it with unlikely().

Note that the 2.5.32 version of this check will cause the kernel to
always panic since it checks for the kernel segments and will thus
decide to jump to the pnpbios fault handler without being in pnpbios.
pnpbios_core.c instead seems to use the correct values.

Gotta ptrace_unlink before calling release_task, and instead of fiddling
with the real_parent directly.

drivers/net/ppp_generic.c: Fix byte-aligned packets, nearly every arch csum_partial cannot handle this.