I had a problem when compiling a 2.6 kernel with gcc 3.5 CVS.  The
prototype for prio_tree_remove in mm/prio_tree.c is inside another
function.  gcc 3.5 gets upset and removes the function completely.
Apparently this isnt valid C, so lets fix it up.

Details can be found here:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17205Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nehemiah wasn't having the CX8 bit enabled before.
In fixing it up, I rewrote the code to be a little clearer.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>

 - big functions moved out of line;
 - handle dev == NULL case, which apparently means the isa device.

As before, this is needed for Jensen. This also makes the isa sound
drivers working again with recent kernels.

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

Patch from Ben Dooks

Register definitions, and support for modifying the
Drive Strength Control registers on the S3C2440

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Ensure we check for IRQ pending for the gettimeoffset()
function

Patch from Ben Dooks

Add the definition of timer 0's dead-zone capability

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

Need to clear one bit at a time, so if we are
clearing both 625_CORE_CLOCK and ALTCLOCK
we first clear the latter then the final
write will clear the former.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Otherwise we do not handle properly the case
where the switch/hub does not support auto-
negotiation.  This is what was breaking 5704
hw fiber autoneg.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@redhat.com>

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

[patch] libata: ata_piix.c PIO fix

"[libata] transfer mode cleanup" introduced bug in ata_piix.c:
previously PIO number (not mode) was passed to piix_set_piomode().
Fortunately this function is only used for (disabled) PATA support.

I bet that this is the reason why MWDMA didn't work for PATA.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

The ioctl32 conversion registration stubs are in ioctl32.h now.
Signed-off-by: Andrew Morton <akpm@osdl.org>

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

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

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

Paolo Giarrusso points out that the UML merge incorrectly
caused INITIAL_JIFFIES to be reset back to zero, instead
of the debug value for getting an early jiffies wrap.

Fix it back up.

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

This patch fixes a problem introduced when CK804 support was added.  mmio_base can only be set in the CK804 case,
else libata will attempt to iounmap mmio_base, which isn't iomapped for the non-CK804 case.  Still need the bar 5
address, so steal from host_set->ports[0]->ioaddr.scr_addr.  Jeff, let me know if this is a bad thing to do.

Fix of the debug/trace driver and removal of irq locks.

 - Only spinlocks[bh] are used now.
 - Removed obsolete direct debug /proc interface.
 - Update of internal trace features and its API.
 - Use common definition of MAX_DESCRIPTORS.

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

Optimizes transmit windows for improved performance and to prevent
TX underruns. Fixes driver registration error handling. Fixes ZMII
and RGMII thinkos. Fixes for MDIO handling issues from Ralph
Siemsen. Please apply.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>

We seem to have found an overflow problem in libata-core.c.
We were trying to DMA to the address range 0xffff8000-0xffffbfff.

In the original version of the code, given that address and
count (0xffff8000 and 0x4000), the variable "boundary" would be
set to 0, causing len to be set to 0x8000 (which is greater than
sg_len).  Then at the bottom of the loop, sg_len would be set
to 0xffffc000 (0x4000 - 0x8000), which would then cause the
loop never to terminate (until much of memory was scribbled
over or the kernel died).

The code below should be functionally identical, but not be
subject to the same overflow problem (boundary needs to be a
u33).

Signed-off-by: jeremy@sgi.com

===== drivers/scsi/libata-core.c 1.94 vs edited =====

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

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

From: Laurent <laurent@gobio2.net>

Some time ago, I sent on this list a mail about my strange problem with my
SiS900 network card (Subject was Sluggish performances with FreeBSD)

To sum up, when my card is in 100Mb mode, I have poor throughput but in
10Mb, all seems normal.

After some tests, it seems these results was due to a misdetection of the
PHY device.  mii-tool reports :

 product info: vendor 08:00:17, model 3 rev 0

and after some search on the web, I found it's a NS DP83847 which is very
similar.
Signed-off-by: Andrew Morton <akpm@osdl.org>

into austin.ibm.com:/shaggy/bk/jfs-2.5

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

into hostme.bitkeeper.com:/repos/j/jfs/linux-2.5

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

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It seems that CONFIG_IDE_TASKFILE_IO code in pdc4030.c was never tested
(i.e. writes don't work et all because of bogus rq->cmd check).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Let's kill the obsolete CONFIG_BLK_DEV_HD98 entry.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Arjan van de Ven <arjanv@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>