* Merge VLAN defines and support from vger, ifdef'd out until
  API appears in main tree.
* Support RX checksumming.
* Correct CP_MAX_MTU.
* Clarify CP_MIN_MTU issues.

from e1000 net driver.

that accidentally crept back into driver.

into mandrakesoft.com:/spare/repo/net-drivers-2.5

hardware limits) to the 8139cp net driver.

Written by Irene Zubarev, Tong Yu, Jyoti Shah, Chuck Cole, and me.

	- changed proc entry creation to use the proper parent directory variable.

	- pcihpfs cleanup, removing unneeded file operations.
	- Added facility to have the files change their timestamps if the data
	  within the file changes.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

This patch allows my qlogic pcmcia scsi card to compile again, as broken
by the recent scsi layer changes. 

Despite davem's apparent suggestion that it'd be better to rewrite the
driver, i'd rather not _just_ right now :)

	/ Brett Pemberton

Numerous bugfixes brought forward from 2.4. I added some quick bio fixes
to mtdblock.c, which seemed to work for me whilst testing JFFS2 changes.

Forward ports from 2.4, Various janitor bits, and some fixes by me to
make the thing work again in 2.5.  I munged the MTDRAM driver to work
also (seperate patch to follow), and it seems to work.

David Woodhouse gave this the once over, and approved the changes.
Complete changelog below:

o   Don't create two slabcaches with the same name.
o   Don't corrupt eraseblock lists on mount
o   Don't mark nodes obsolete during mount
o   __attribute__((packed)) on the node definitions.
o   Fix up() without down() in jffs2_readdir().
o   Fix duplicate version number usage - s/highest_version++/++highest_version/
o   Fix (i.e. implement) mtime/ctime on directories.
    maybe too busy with the bk stuff
o   Don't allow hardlinks of directories.
o   s/(mode&S_IFMT)==S_IFLNK/S_ISLNK(mode)/ et al to keep Al happy.
o   Fix for garbage-collection of holes, where we used to write nodes out
    with csize/dsize swapped. Workarounds for existing such brokenness.
o   Improve wear levelling by rotating node lists on mount, to avoid starting
     at one end of the flash every time.
o   Remember to get internal inode-semaphore on symlink operations.

Enable NFS over TCP via config option

Limit number of active tcp connections to an RPC service

If a connection comes in and that results in number of
connections being more than 5 times the number of threads,
then we close a connection.

We randomly drop with the oldest or the newest connection.

Thus if we are flooded with connection requests, some will
get in and hopefully stay long enough to service at least one request.

Declare response sizes for nfs/lockd requests

This allows sndbuf reservation to be more accurate.

For lockd we just say "0" for now, meaning assume the max.
This could be improved, but it isn't critical.

Make sure there is alway adequate sndbuf space for replies.

We keep track of how much space might be needed for replies
and never dequeue a request unless there is adequate space
for a maximal reply.  We assume each request will generate a maximal
sized reply until the request is partly decoded.
Each RPC program/procedure can specify the maximum size
of a reply to the precedure (though they don't yet).

The wspace callback is used to enqueue sockets that may be waiting
for sndbuf space to become available.

As there should always be enough buffer space to the full
reply, the only reason that sock_sendmsg could block is due
to a kmalloc delay.  As this is likely to be fairly quick (and if
it isn't the server is clagged anyway) we remove the MSG_DONTWAIT
flag, but set a 30 second timeout on waiting.  If the wait
ever times out, we close the connection.  If it doesn't we can
be sure that we did a complete write.


When a request completes, we make sure that the space
used for the reply does not exceed the space reserved.  This
is an internal consistancy check.

This patchs sets the sndbuf and rcvbuf sizes for all sockets
used for rpc service.  This size if dependant on the servers bufsize (S) and
partially on the number of threads (N).

For UDP
    sndbuf == 5*S
    rcvbuf == (N+2)*S
for TCP
    sndbuf == N*S
    rcvbuf == 3*S

see code for rationale (in comments).

Close idle rpc/tcp sockets

We split the list of sv_allsocks into two, one
of permanent sockets (udp, tcp listener) and one
of temporary sockets (tcp data).

Whenever we complete a successful receive on a temp socket,
it gets pushed to the end of the list.

Whenever a thread wants to do something, it first checks if
the oldest temp socket has not has a receive for 6 mintutes
(should possibly be configurable).  It so, we simulate
a close.

Finally we make sure that threads wake up every few minutes
so that if the server is completely idle, all temp
sockets will get closed.

Detect and close tcp connections that we cannot work with.

If an rpc fragment that arrives on a tcp connection
is non-terminal or too large for our buffer, then we
have to close the connection.
Also, if a write fails on a tcp connection, we close
the connection.

Tidy up SMP locking for svc_sock

sk_lock is not necessary and is now removed.
The only things that were happening under sk_lock but
not the more global sv_lock were testing and setting
some of the flags: sk_busy, sk_conn, sk_data etc.

These have been changed to bits in a flags word which are atomically
set and tested.

Also, by establishing some simple rules about that must
be done after setting these flags, the locking is not needed.

With this patch sk_conn and sk_data are now flags, not counts (sk_data
was already a flag for udp).  They are set if there might be
a connection or data, and only clear when we are sure there aren't
(or when we are about to check if there is).

svc_sock_accepted becomes identical to svc_sock_recieved and
so is discarded in favour of the latter.

sk_rqstp was never used and is now gone.

Get sunrpc to use module_init properly

rpc_register_sysctl was called in several places.
Now only once.

Change sunrpc to use more list.h lists

The sunrpc client code uses home-grown doubly linked
lists to group
   - idle server threads
   - pending server sockets
   - waiting rpc tasks
   - all rpc tasks.

This patch converts all of these lists to <linux/list.h> lists and
also makes the list of all server sockets for a particular server into
a list.h list instead of a single-link list.

Possibly the least obvious change is replacing RPC_INIT_WAITQ
with RPC_WAITQ and INIT_RPC_WAITQ.  These follow the model of
LIST_HEAD and INIT_LIST_HEAD defined in list.h and are needed
to initialise the list_head in the rpc_waitq properly.

Remove last unneeded bit of BKL from knfsd

Remove BKL from nfsservctl systemcall.  All
components have their own locking.
Also remove it from the body of nfsd threads.  Keep
it for final thread destruction though.

Protect read-ahead cache with SMP safe locking

As another step to removing the BKL from nfsd, this patch
protects the read-ahead cache with a spinlock.

Protect dentry attachement from BKL

The process of attaching a dentry into the dcache
still needs the BKL I think.
When all the other BKL changes in the VFS settle down, I
will revisit this.  But as it is not a very frequent
operation, the BKL wont hurt.

Also add a down/up of i_sem when doing a lookup(".."),
as it is down for all other lookups.

Tidy up locking in nfssvc - preparing for BKL removal

- nfsd_busy becomes atomic_t
- nfsd_call_lock created to protect timing of calls and stats gathering
- lock_kernel around thread creation and destruction.  It is
  sufficiently uncommon that it doesn't really need a lock of it's
  own.  It is currently under the BKL because all of the nfsservctl
  syscall is, but that is about to be removed so we preserve BKL here.

Lock reply cache with SMP safety.

As a second step to removing the BKL from nfsd, this patch
protects the reply cache with a spinlock.

This patches also removed cache_initialised as it
is not longer needed (due to earlier patch).

Change export table lock to (SMP safe) rwsemaphore

As a first step to removing the BKL from nfsd, this patch
changes the lock used for the export table to be a rwsem semaphore.
Previously it had the same functionality but depended on the BKL
for correctness.

As there is no "down_write_interruptible" this patch removes the
posibility of interrupting the write_lock request, but this should
never be needed anyway.

Fix include file so syscall compiles when NFSD not configured

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

As a step in the process of updating all the linux input drivers to the
most recent version available, this patch updates all the joystick
drivers that are in the kernel tree.

Changes are mainly the input hotplug/proc support in every of the
joystick drivers, and fixing trivial bugs here and there. I can supply a
more detailed description upon request.

This fix is from Dave Bogdanoff <bog@transmeta.com>.

Linux incorrectly sets up IDE timings for secondary slave drives on PC
systems that use Intel PIIX Southbridges.

This will correctly shift IDE slave PCI timings for register 44h so
that:

 - secondary slave (drive1) uses bits 4-7
 - primary slave   (drive1) uses bits 0-3

(The addition of the parentheses is needed so the shift will take
place after the bitwise-or.  Without the parentheses, the shift will
incorrectly always take place before the bitwise-or.)

x86_64 does not have an irq_stat array. It puts the interrupt information
into its per CPU area instead, allowing more efficient access to it.
This patch allows the architecture to overwrite
the __IRQ_STAT access macro in linux/irq_cpustat.h.

It is required to make the x86_64 port compile.

-Andi

This patch makes x86-64 compile in 2.5.5 and syncs it with changes in the i386
port. It also fixes some bugs that were discovered in recent testing:
- enhance 32bit emulation and fix bugs.
- fix security hole in vmalloc handling
- Do not use lockless gettimeofday for now because it is buggy.
The patch only changes x86_64 specific files.

-Andi

- added support for KERN_ prefixes for snd_printk
- verbose printk (file:number) is now optional
- fixed devfs OSS device names in soundcore
- added XRUN ioctl for PCM API
- improved support for Sound Blaster Audigy
- fixed AC3 forwarding for Sound Blaster Live!
- more fixes in dependencies in Makefiles
- llseek locking fixes for sound/core/info.c
- fixed ISA DMA allocation
- added wait() callback for ac97_codec.c and VIA686 driver
- CMIPCI driver updates
- added AMD-8111 support for Intel8x0

This patch to allow using of RTC timer inside the kernel space.  We can
use the RTC timer as timing source for ALSA sequencer. Patch by Takashi.

The patch adds these three functions and one structure to rtc.h and
rtc.c:

typedef struct rtc_task {
       void (*func)(void *private_data);
       void *private_data;
} rtc_task_t;

int rtc_register(rtc_task_t *task);
int rtc_unregister(rtc_task_t *task);
int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg);

					Jaroslav

This moves the dmi scan to an earlier stage so that we can trap issues
such as the various laptops that don't like enabling APIC.
It's likely to be useful for trapping other similar early-boot problems.
Originally by Mikael Pettersson

Linus,
 Current driver in your tree has been 'fixed' by someone without
understanding just how broken it was. Numerous fixes were done in 2.4
after the 2.5 split by Alan.

This patch reverts the damage the driver does in your tree, and brings
Alan's 2.4 bits over instead. Downside: It doesn't compile.
Upside: It doesn't pretend to work and corrupt data, and at least
is the right base for people to start fixing.