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

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>

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>

From: Alan Cox <alan@redhat.com>

Some interfaces (notably PCMCIA ones) don't decode the master/slave select so
you get two copies of a device appearing and bad things happening if a user
accidentally uses both. 

This checks for the model/serial matching but also knows about non ATA drives
ide=noprobe and a Maxtor problem that was found in Andrew's testing of an
earlier patch. Although M00000.. drives should be RMA'd to Maxtor (and with
info on where they were obtained...) we don't want to break anyone who has
them.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Alan Cox <alan@redhat.com>

If you get invalid geometry (eg a failed drive) the box hangs on boot because
we try and unregister the registered driver and end up in a locking mess.

We change the behaviour to simply leave the device unattached which avoids
the mess.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Alan Cox <alan@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Alan Cox <alan@redhat.com>

This was put in for PPC specifically and defined in the 2.4 tree to be
paranoid about breaking stuff. The actual wait for hwif spin up is however
perfectly correct for all drives. In the normal PC case the PC BIOS has done
this but with other embedded boxes and with things like LinuxBIOS it may not
have done. Thus it should always be done.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As noticed by Alan Cox:

"It doesn't work now so it clearly isnt being used 8). We hold the lock
because its a proc function and we then replace the proc functions in the
attach method -> deadlock. It is also incredibly hard to fix without a
major rewrite."

The same is true for HDIO_SET_IDE_SCSI ioctl.

Both were broken 18 months ago in 2.5.63 as a side-effect of locking fixes.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

SGI Modid: xfs-linux:xfs-kern:177850a
Signed-off-by: Nathan Scott <nathans@sgi.com>

O_SYNC write improvements recently.
Signed-off-by: Nathan Scott <nathans@sgi.com>

needs to fallback to buffered in the generic code, we are able to
relock the XFS inode correctly.
Signed-off-by: Nathan Scott <nathans@sgi.com>

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

Let's leave the code for a while yet, and see if somebody screams.
But both Red Hat and SuSE claim it is unused, so it probably is. The
driver hasn't gotten updated in years, and google doesn't seem to
show any usage either.

Signed-off-by: Nathan Scott <nathans@sgi.com>

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

concurrent inode allocations.  Fix from ASANO Masahiro.

SGI Modid: xfs-linux:xfs-kern:177699a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:177663a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:177627a
Signed-off-by: Nathan Scott <nathans@sgi.com>

truncate files.

SGI Modid: xfs-linux:xfs-kern:177585a
Signed-off-by: Nathan Scott <nathans@sgi.com>

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

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>