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

for the definition of unlikely().

The patch below changes access_process_vm to use a new architecture
hook, flush_icache_user_range, instead of flush_icache_page, and adds
a definition of flush_icache_user_range which does the same thing as
flush_icache_page for all architectures except PPC.  (The PPC update
that is in Linus' BK tree already includes a suitable definition of
flush_icache_user_range.)

The reason for doing this is that when flush_icache_page is called
from do_no_page or do_swap_page, I want to be able to do the flush
conditionally, based on the state of the page.  In contrast,
access_process_vm needs to do the flush unconditionally since it has
just modified the page.  In the access_process_vm case it is useful to
have the information about the user address and length that have been
modified since then we can just flush the affected cache lines rather
than the whole page.

This patch should make it easy to improve performance on alpha, since
there (as I understand it) the icache flush is not needed at all in
do_no_page or do_swap_page, but is needed in access_process_vm.  All
that is needed is to make flush_icache_page a noop on alpha.  The
patch below doesn't do this, I'll let the alpha maintainers push that
change if they want.

This patch fixes a compile error on PPC.  It's in sd_find_target, a
function that returns a kdev_t.

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

This one-liner fixes an error case in Menuconfig when awk fails.
Written by Andrew Church (achurch@achurch.org).
Reviewed and tested by Michael Elizabeth Chastain (mec@shout.net).

Michael Elizabeth Chastain

===

Add help texts for CONFIG_PCMCIA_AXNET and CONFIG_PCMCIA_XIRCOM

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

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

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

Integrate ALSA into v2.5.4

            Jaroslav

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

  condition, we test the preemption count in preempt_schedule(). This reduces the icache
  footprint and the overhead of preemption.

- plus optimize the irq-path preemption check a bit.

this is a fragile piece of the ptrace code, the code relies on a single wakeup coming from the parent.
This fix is necessery after the preempt_schedule() cleanups, it unbreaks 'strace strace ...'.

fixes a preemption race that was introduced by my removal of PREEMPT_ACTIVE.

into hostme.bitkeeper.com:/ua/repos/g/gkernel/net-drivers-2.5

into hostme.bitkeeper.com:/ua/repos/g/gkernel/misc-2.5

- the PREEMPT_ACTIVE trick is not needed

- schedule() should check for need_resched, we might miss a
  reschedule otherwise.

the cleanup also fixes the bug. The only reason why i kept
preempt_schedule() was to fix up p->state to TASK_RUNNING,
to make it possible to preempt from places that mark the
task TASK_UNINTERRUPTIBLE before adding the task to a waitqueue,
and thus a preemption in that small window could cause the
task to be removed from the runqueue erroneously.

  
this is a patch to prevent usb_set_interface() from erroneously resetting
the toggles for all endpoints instead of only the affected ones from the
requested interface/altsetting. I've also added some missing parentheses
to related macros in usb.h as I prefered not to take special care for
nasty side-effects ;-)
  
Patch below was created against 2.4.18-pre9 (with some lines of offset it
applies to 2.5.4-pre5 as well).
  
Tested in multi-interface configuration to provide evidence it:
* correctly identifies the affected endpoints and resets the toggles
* doesn't touch endpoints from other interfaces
* provides correct handling of shared EP0
* solves an issue I had with 2.4.18-pre9 where setting one interface
  occasionally caused transfers on other interface to hang due to lost
  toggle synchronisation

Despite being a pure bugfix, well localized and (IMHO) pretty obviously
correct wrt. USB-spec, I'd like to suggest including this in early
2.4.19-pre. Just in case some existing driver would somehow workaround
the currently wrong behavior and might break with this fix. And it's
not very urgent right now, as we are probably close to 2.4.18-rc1.
  
Regards,
Martin

	- patch to fix bug where urbs were freed too soon.

Contributor: Ed Vance @ Macrolink

Contributor: Go Taniguchi

into bmac and mace net drivers.

Via Dave Jones.

'sungem' which DaveM is maintaining is the replacement.

net driver.  Also included are a couple of minor error reporting
updates and the proper detection for cardbus removal.

Contributor:
Mike Phillips
Linux Token Ring Project

the ibmtr token ring net driver. 

Contributor:
Mike Phillips
Linux Token Ring Project

* Only print warning on truly "oversized" packets
* Fix theoretical bug on gigabit cards - return to 1.1.3 behavior

Contributor: Val Henson

from 2.4.x.
Also, remove deprecated SIOCDEVPRIVATE ioctl calls.

Via Dave Jones.

0.13a - optical transceiver support added
	by Michael Clark <michael@metaparadigm.com>
0.13b - call register_netdev earlier in initialization
	suppress duplicate link status messages
0.15	get ppc (big endian) working

Via Dave Jones.

Fix originally by Andreas Dilger IIRC, merged by Dave Jones.

Via Dave Jones.

for dmfe net driver from 2.4.x.

Via Dave Jones.

which prevented the driver from building.

Via Dave Jones.