into home.osdl.org:/home/torvalds/v2.5/linux

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

into kernel.bkbits.net:/home/davem/sparc-2.5

Bug noticed by Russell King.

ioremap_nocache() doesn't need to check for physical address
wraps because __ioremap() has already done that;
fix calculation of npages to handle non-aligned phys_addr;

get_unique_tuple doesn't check that the tuple is unique if it finds
a hash_by_src match.

Noticed by Stuart_Hayes@Dell.com:

I've noticed that, in the 2.6 (test 9) kernel, the "cmd" field (of type int)
in struct request has been removed, and it looks like all of the code in
ide-tape has just had a find & replace run on it to replace any instance of
rq.cmd or rq->cmd with rq.flags or rq->flags.

The values being put into "cmd" in 2.4 (now "flags", in 2.6) by ide-tape are
8-bit numbers, like 90, 91, etc... and the actual flags that are being used
in "flags" cover the low 23 bits.  So, not only do the flags get wiped out
when, say, ide-tape assigns, say, 90 to "flags", but also the 90 gets wiped
out when one of the flags is modified.

I noticed this, because ide-tape checks this value, and spews error codes
when it isn't correct--continuously--as soon as you load the module, because
ide-tape is calling ide_do_drive_cmd with an action of ide_preempt, which
causes ide_do_drive_cmd to set the REQ_PREEMPT flag, so "flags" isn't the
same when it gets back to idetape_do_request.

Set filp->private_data in idetape_chrdev_open() to point to a opened drive,
otherwise driver oopses during future access to tape character device.

Thanks to Stef van der Made <svdmade@planet.nl> for testing ide-tape fixes.

into home.osdl.org:/home/torvalds/v2.5/linux

Moving isapnp further down in the bus initialization obviously sparked
some new problems.

Instead, remove the legacy netdev probing function from dev.c and give
it its own initcall later in the cycle.

This patch prevents a crash that happens when per-CPU data is allocated
only for CPUs that are online.

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

Trivial build fix for the debug code in drivers PCI.  Seems like nobody
has had to use this code in a long time.

If sg->dma_address is set, we try to do a __pa() on a dma_address,
then, later, create a dma_addresss from a munged dma_address.  When
this bogus dma_address is used by the card, it results in MCAs.

into nuts.ninka.net:/disk1/davem/BK/net-2.5

Only regular files, directories and symbolic links can have any
blocks allocated to them - other types of files have different
metadata in their inodes and should not get to the truncation
paths. Enforce this in fs/minix/inode.c.

Without this, deleting a block or character device can cause
minix filesystem corruption. Noted by Konstantin Boldyshev.

Getting a signal while in vm86 caused warnings because we still had
interrupts disabled - for no good reason. Enable interrupts before
accessing user space.

This extends the agppart table with three new SiS chipsets that must be
handled as the other ones.  No actual code changes.

into nuts.ninka.net:/disk1/davem/BK/net-2.5

This separates out the PIRQ table parsing to vendor-specific
code, which allows us to handle specific vendor quirks. In
particular, SiS has a really funky notion of what PCI device
ID's are meant to be.

Some hardware designers seem to be hitting the recreational
drugs a bit too heavily. Tssk, tssk.

The Sis96x irq routing update is confirmed to fix at least
one laptop.

From Vojtech Pavlik <vojtech@suse.cz>.

Change AMD8111 and nForce2 max speed to UDMA133.

Add workaround for Serenade mainboards which only handle UDMA100.

Fix printing of chipset name.

Fix some whitspace issues.

Original 2.4.23-pre4 patch by Allen Martin <AMartin@nvidia.com>.

This does not add any new code, it only adds new PCI ID's and related
info to the existing driver.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Cures reported lockups.