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

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

From: Tom Alsberg <alsbergt@cs.huji.ac.il>

Add support for a new eepro100 PCI ID.

It's using "||" instead of "|".  Makes slab go BUG.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

As we'll be checking `status' for errors, it had better not be unsigned.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix a check for underflow.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Don't compare unsigned value for < 0.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Don't check unsigned values for <= 0.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix decnet ioctl(TIOCOUTQ).

From: Albert Cahalan <albert@users.sourceforge.net>

This is needed so that apps can set appropriate column widths for PID
display.

From: Joe Thornber <thornber@sistina.com>

Split the dm_create() function into two variants, depending on whether you
want the device to have a specific minor number.  This avoids the broken
overloading of the minor argument to the old dm_create().

From: Hugh Dickins <hugh@veritas.com>, Christoph Rohland <cr@sap.com>

Switches the long GPL blurb which Hugh took from the 2.4-ac version of
mm/shmem.c, back to the original oneliner (as in 2.4.current).

Christoph spotted that the long blurb says "either version 2 of the License,
or (at your option) any later version", whereas he intended it be as COPYING
says, version 2 period.  Hugh and Christoph are happier with known version 2
than undefined future variants.

From: James Morris <jmorris@intercode.com.au>

This patch against current bk removes anon_hash_chain from fs/inode.c, as
all inodes in the 2.5 kernel must be associated with a superblock, and the
anon hash is no longer needed.

(akpm: Well there's one inode with a null i_sb: swapper_inode.  But it
shouldn't get here and if it does, we'll fix it by other means).

From: Dipankar Sarma <dipankar@in.ibm.com>

Forward-port of a fix Alan merged into 2.4.21-pre.  It fixes arcnet oopses
with raw sockets.

From: george anzinger <george@mvista.com>

This patch addresses issues of roundoff error in the time keeping and NTP
code as follows:

The conversion of "actual jiffies" to TICK_USEC and then to TICK_NSEC
introduced large errors if jiffies was not a power of 10 (e.g.  1024 for
the ia64).  Most of this is avoided by converting directly to TICK_NSEC.

The calculation of MAX_SEC_IN_JIFFIES (the largest timespec or timeval the
kernel will attempt) had overflow problems in the 64-bit machines.  We
introduce a different equation for those machines.

The NTP frequency update code was allowing a micro second of error to
accumulate before applying the correction.  We change FINEUSEC to FINENSEC
to do the correction as soon as a full nanosecond has accumulated.

The initial calculation of time_freq for NTP had severe roundoff errors for
HZ not a power of 10 (i.e.  1024).  A new equation fixes this.

clock_nanosleep is changed to round up to the next jiffie to cover starting
between jiffies.

From: george anzinger <george@mvista.com>

This patch does the following:

Pushs down the change from timeval to timespec in the settime routines.

Fixes two places where time was set without updating the monotonic clock
offset.  (Changes sys_stime() to call do_settimeofday() and changes
clock_warp to do the update directly.) These were bugs!

Changes the uptime code to use the posix_clock_monotonic notion of uptime
instead of the jiffies.  This time will track NTP changes and so should be
better than your standard wristwatch (if your using ntp).

Changes posix_clock_monotonic to start at 0 on boot (was set to start at
initial jiffies).

Fixes a bug (never experienced) in timer_create() in posix-timers.c where
we "could" have released timer_id 0 if "id resources" were low.

Adds a test in do_settimeofday() to error out (EINVAL) attempts to use
unnormalized times.  This is passed back up to both settimeofday and
posix_setclock().

Warning: Requires changes in .../arch/???/kernel/time.c to change
do_settimeofday() to return an error if time is not normalized and to use a
timespec instead of timeval for its input.

From: Vojtech Pavlik <vojtech@suse.cz>

- irq_return_t fixes

- remove obsolete pci_driver.driver bits

From: "Protasevich, Natalie" <Natalie.Protasevich@UNISYS.com>

Include ES7000 specific code for es7000 subarch.