Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

 - qlogicfc.c abuses SCSI_TIEMOUT although it's not part of the scsi
   core, give it it's own ISP_TIMEOUT define
 - avoid redefining timeouts #ifdef DEBUG, that's a cause for heisenbugs
   just waiting to happen
 - now SCSI_TIMEOUT is private to scsi_scan.c, move it there
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On 1 Jun 2004, James Bottomley wrote:
> On Tue, 2004-06-01 at 15:29, Alan Stern wrote:
> > In addition, the settle-time delays would have to be removed from the
> > error handler -- which means adding it to all the low-level drivers.  Is
> > that doable?
>
> Well, for 2.6, I think that a simple flag indicating that the driver
> will implement it's own timeout should suffice rather than altering
> every LLD...
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Douglas Gilbert <dougg@torque.net>

Here are some further refinements to this patch with help
from Pat Mansfield:
     - replace vmalloc() with kmalloc(,GFP_KERNEL)
     - bump max sg devices from 8192 to 32768

Tested to 16k devices (and 8k devices on a box with 512MB
ram), Patch is against lk 2.6.6 (or 2.6.6-bk1).
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

I actually wanted to fix up the check_region usage there but got lost
in the mess.  Let's start by kicking out the 2.2 compat and using scsi
layer constants instead of their own redefinitions first.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: "Adam Radford" <aradford@amcc.com>

This small patch fixes the broken schedule_timeout() usage in the 3w-9xxx
driver, and replaces the calls with msleep().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: "Adam Radford" <aradford@amcc.com>

This patch updates the 3w-9xxx driver in 2.6.7-rc2-mm1 to v2.26.02.000 to
cleanup several things pointed out by Chris Hellwig / Jeff Garzik.

Changes in this release:
  - Use descriptive defines for phase numbers.
  - Remove un-needed casts for TW_Command_Full
  - Rework eh_reset(), eh_abort() spinlocks.
  - Remove all mdelays, replace w/ schedule_timeout().
  - Remove MODULE_PARAM cmds_per_lun, add sysfs device attribute 'queue_depth'.
  - Remove twa_slave_configure().
  - Remove twa_info().
  - Remove all bitfields from structures, add bitmask macros.
  - Remove twa_setup_irq() wrapper, call directly.
  - Remove un-needed prototypes.
  - Propogate return value of pci_enable_device(), pci_set_dma_mask(), ioremap().
  - Use pci_request/free_regions().
  - Add missing call to pci_disable_device() on probe failure.
  - Unregister character ioctl interface in twa_remove().
  - Make some excessively lengthy lines < 80 columns.
  - Use pci_module_init() instead of pci_register_driver().
  - Remove bogus TW_IN_INTR check, fix twa_interrupt() spinlock.
  - Rev driver branch to .02 to denote kernel version.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Alan Cox <alan@redhat.com>

I think it might be a good thing if this was fixed to match 2.4
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

__init is only for functions
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Based on "eata_generic.h", this SCSI controller has 9 bytes of IO
space, not 8, so update request_region(), release_region(), and
n_io_port to use 9 instead of 8.

diffstat:=
 drivers/scsi/eata_pio.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On Wed, 2004-05-19 at 05:38, Herbert Xu wrote:
> This is a resend of my patch that adds basic support for highmem
> on i386 to the advansys driver.  It has been tested in
> http://bugs.debian.org/245238.
>
> The maintainer email address listed in the MAINTAINERS file bounced
> so someone else will need to look at this.

I converted your patch to use the DMA-API.  This will be necessary to
use the EISA advansys boards---Of course, EISA won't work properly until
the entire driver is converted to the driverfs probing API, sigh, but
I'll get around to that eventually.

OK, and I couldn't resist getting rid of the stupid in_isr locking on
the done function.

Converted from original patch by Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

again, the init code could use some bigger rework, but let's stick to
the minimal fix until we have some testers.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

I'd love to rework the init sequence a bit more, but without beeing able
to actually test the driver I'd rather stick to the bulletproof fix.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Original patch from
http://marc.theaimsgroup.com/?l=linux-scsi&m=107428662718579&w=2
reworked to according to James' suggestion to handle NO_SENSE the same
as RECOVERED_ERROR.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

megaraid does sleep_on_timeout on a stack waitq - use msleep instead.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On Sun, 23 May 2004, Christoph Hellwig wrote:
> The other thing is that most calls to dc390_findDCB could probably be
> replaced with stroing the pDCB in scsi_device->hostdata on slave_alloc,
> but that could aswell be done in an incremental patch.

Done in the attached patch. Tested as usual and a bit harder.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch has been floating around for ages, got reminded of it again
when looking at the debian kernel package.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Here is an updated version v2.26.00.009 of the 3ware 9000 SATA-RAID driver.

Changes in this release:
   - Convert driver to pci_driver format.
   - Remove proc interface, add sysfs attributes.
   - Return SCSI_MLQUEUE_HOST_BUSY when card status is busy.

Future versions may include:
   - PAE fix
   - 80 column wrap fixes
   - Remove more prototypes by re-ordering functions.
   - sysfs queue depth adjustment instead of module_param
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

This patch improves some of the handling of PA-RISC tulip cards.

 - Introduce HAS_SWAPPED_SEEPROM and NEEDS_FAKE_MEDIA_TABLE
 - Only trigger this code on GSC machines.  The pure PCI machines don't
   have these cards.
 - Allow the chip_name to be overridden in tulip_init_one().
 - Fix some indentation.
 - Handle the output from tulip_read_eeprom() better.

> From: Ralf Baechle <ralf@linux-mips.org>
> Subject: [PATCH] Stop queue on close in hdlcdrv
> To: Jeff Garzik <garzik@gtf.org>
> Date: Tue, 4 May 2004 13:59:15 +0200
>
> The stop method of a driver should ensure queueing is stopped ...
>
> diff -u -r1.19 hdlcdrv.c
> --- suckage/drivers/net/hamradio/hdlcdrv.c 12 Apr 2004 20:23:32 -0000

the above means the following is needed for my drivers - please apply to 2.6:

i386 gets it implicitly from somewhere but some architectures don't.
Also move <asm/uaccess.h> down so we have asm after linux headers.

s2io_rem_nic() is marked __exit and is being referred to from .data.
Signed-off-by: Andrew Morton <akpm@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/net/ixgb/ixgb_main.c: In function `ixgb_intr':
drivers/net/ixgb/ixgb_main.c:1593: warning: unused variable `hw'
(catch by J. Cherry).

This happens because `hw' is only used when CONFIG_IXGB_NAPI is not set.
As `hw' is used only to have the code readable, we can use it for
!CONFIG_IXGB_NAPI too.
Signed-off-by: Andrew Morton <akpm@osdl.org>

into redhat.com:/spare/repo/net-drivers-2.6

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

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

into nuts.davemloft.net:/disk1/BK/sparc-2.6

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

Some RTX Telecom based USB dongles offer SCO support, but their
implementation is broken. This patch disables the use of the ISOC
interface for these devices.

If no channel is specified for a RFCOMM server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>

If no PSM is specified for a L2CAP server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>