Attached patch brings over the sane bits from 2.4-ac: i.e. if Linus
merges this and Alan merges your patch minus my complaints, the two
trees will be in sync...

 - Finally unify task_in_intr and task_mulin_intr. One crucial code path less to
   watch out, but a quite dangerous step in itself. PIO reading is functional
   again. The next step will be the unification of the write path of course.

 - Introduce a small helper for the execution of task file commands which
   basically just send a simple command down to the drive.

 - Add a buffer parameter to ide_raw_taskfile allowing to unify the handling of
   ioctl and normal ide_raw_taskfile request.

 - Fix some small function pointer type mismatches.

Apply more host chip controller clenups by Bartlomiej:

     - move setting drive->current_speed from *_tune_chipset()
       to ide_config_drive_speed()

    cmd64x.c:
	- convert cmd64x_tuneproc() to use ata-timing library
	- clean cmd64x_tune_chipset() and cmd680_tune_chipset()

    hpt366.c:
	- remove empty timings table

    it8172.c:
	- kill prototypes
	- update to new udma_setup() scheme

    - misc cleanups

  Set up CardBus cards correctly: initialize them fully
  before calling device_register(), and make sure to tell
  the world that it's a PCI-like bus.

This kills Sysrq-D support (did not work anyway, and complicated
code).

Adds resume support to i8259A (otherwise interrupts will not work
after S3).

HAVE_NEW_DEVICE_MODEL is always true in 2.5, so we should define
it. S3 can't work properly without that. Also limit toshiba workaround
to S1. (This hide lack of i8259A support for me).

Fixes compilation, and kills <asm/suspend.h> being included
twice with ugly hacks around.

- (leak) memory allocated in dscc4_found1() isn't freed by caller in error path.
  dscc4_free1() is now in charge of this duty.
- (style) code factored in dscc4_remove_one after use of dscc4_free1().

- (compilation fix) plain old typo in struct member naming.

- (compilation fix) missing init.h include;
- (compilation fix) multiple pointers can't be set to NULL in one line if their
  type differ.

Courtesy of Kevin Curtis <kevin.curtis@farsite.co.uk>, posted
on l-k the 2002/04/15.

Description
- (compilation fix) removal of deprecated fields in net_device;
- (bug) early pci_enable_device.

Below a patch removing the list of sense codes from usb/storage/debug.h
since the same list is already found in scsi/constants.c.
This also brings this list up to date with SCSI-3.

The patch below cleans up some SCSI stuff.

The main purpose is to avoid trying to read the partition table
of a removable disk when the drive has told us that no media
are present. (Right now we try to read a 4K block and fail and
retry and fail, and give an I/O error on the first sector,
then try to read the second sector and fail and retry ...)

Unused fields  sector_bit_size  and  sector_bit_shift  in
struct scsi_disk were removed. The field  has_part_table
(that has nothing to do with partition tables) was
renamed to  has_been_registered . The field  ready  was
renamed to  media_present .
The overly long  sd_init_onedisk()  was split up.

When we notice that no media are present anymore, the
partitions are removed from /proc/partitions, but the
drive remains, with size 0.

A future patch will remove the field  capacity  - there are
all too many places where capacities are stored - but the
present patch is large enough already.

There is also a quite independent patch in scsi_error.c
(yesterday someone had an infinite loop retrying to read
bad media) - this patch honours the SCpnt->retries.
In case you applied this already, just ignore the scsi_error.c part.

Also some "Overrides for Emacs" were removed.

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

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

	- remove call to check_region 
	- check the result of request_region
	- call release_region if something goes wrong afterwards during driver initialisation.

I don't have this hardware so I can't verify if it works (compilation checked only).  

[janitor] update the atarilance Ethernet driver for VME Lance cards on the Atari to check the result of request_irq and exit in case of error.

Patch is also available at the following URL
        http://www.chez.com/wstinson/linux/kernel/patch-net-atari

I don't have this hardware to check for myself

	1) check the status of call to request_region 
	2) and return an error in case of problem.

I don't have this hardware so compilation checked only.

[janitor] update the comx-hw-comx wan driver to remove call to check_region and check the status of call to 
request_region instead.

I don't have this hardware so compilation checked only. 

        1) check the status of call to request_region 
        2) and return an error and release the interrupt held in case of problem.

(In my first attempted patch for this driver I had forgotten to release the interrupt.)

I don't have this hardware so compilation checked only.

to 
	1) check result of calls to request_region and handle failure to allocate region resource
	2) add and use an extra label "Failure1" which frees the region resource
	in case of device driver initialisation error later on
       
I don't have this hardware so changes not tested. 

        1) check the status of call to request_region 
        2) and return an error in case of problem.

Note that a call to check_region still remains in this driver (in subroutine check_s508_conflicts). 

I don't have this hardware so compilation checked only.

        1) remove call to check_region and use request_region instead checking the return value 
        2) release region resource in case of driver initialisation error

I don't have this hardware so compilation checked only.

        1) remove call to check_region 
        2) check the status of call to request_region 
        3) and return an error in case of problem.

and returns -EFAULT in case not all data was copied. Patch also changes the return code
of stl_getserial() from void to int in order to return error code in case of failure.

I don't have this hardware so compilation checked only.

1) checks the result of copy_to_user and 
2) returns -EFAULT in case not all data was copied. 

I don't have this hardware so compilation checked only.

	1) checks the result of copy_XX_user and returns -EFAULT in case not all data was copied. 
	2) Patch changes the return code of stl_getserial() from void to int in order to return error code in case of failure.
	3) Patch also fixes two instances of the uninitialised string name being used on request_region calls

I don't have this hardware so compilation checked only.

	1) check the result of copy_from_user 
	2) return -EFAULT in case not all data was copied
	3) release resources in case of failure

	o [CORRECT] Make discovery expiry work properly for non default
		discovery period/timeout

	        <Following patch from Shimizu Takuja/Gerhard Bertelsmann>
	o [FEATURE] Dongle driver for ActiSys 200L hardware
	        <Following patch from Leung/me>
	o [FEATURE] Dongle driver for Mobile Action MA600 hardware

o [CORRECT] Fix two bugs found by the Stanford checker in IrCOMM

	o [FEATURE] Update various comments to current state
	o [CORRECT] Handle properly failure of URB with new speed
	o [CORRECT] Don't test for (self != NULL) after using it (doh !)
	o [FEATURE] Other minor cleanups

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5