Thanks to DaveM.

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

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

The spinlock was held while calling functions that could block,
while simultaneously being at all times inside the context of
module init/exit.

Thanks to DaveM.

into evo.osdl.org:/home/torvalds/v2.5/linux

This patch fixes DMA bugs on x86-64 and ia64 machines.  The driver was
using commands that only support 32bit addresses in places that could
return 64bit addresses.  One place was DMAing off the stack.  The other
place was causing problems on x86-64 machines by calling pci_map()
functions on a region allocated by pci_alloc_consistent().

This patch fixes two minor bugs.  It allows zero length write commands
through to devices.  It also prevents the writing of any  '\0'
characters at the end of version numbers to ips's /proc/scsi files.

From: "Andrew Vasquez" <andrew.vasquez@qlogic.com>

With additional changes from: "James Bottomley" <James.Bottomley@SteelEye.com>,
                              "Christoph Hellwig" <hch@infradead.org>

This is the qlogic driver version 8.00.00b7 with the ioctl and failover code stripped
out and a few associated fixes put in.

From: "Randy.Dunlap" <rddunlap@osdl.org>

The problem is that the detect function requests an IO region
of 16 bytes (at least when a command line override parameter is
used) but the release function only tries to release 8 bytes,
and this request isn't done because it doesn't match any allocated
IO region.  [NCR53C400 extensions are not enabled, so
NCR5380_region_size is 8, not 16, but the request uses
NCR5380_region_size regardless.]

Fix: save the allocated region size in instance->n_io_ports and release
   that size only;

Fixes build on some platforms.

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

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

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

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

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

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

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

  This was broken by the last commit for cdev stuff which removed the
  "int ret;" that these routines used.

  Retire our char device dispatching logic.  With the 2.6 cdev API we
  can register much smaller device number regions, so we use that instead.

On Tue, Jan 13, 2004 at 06:02:08PM +0300, Sergey Tikhonov wrote:
> The final kernel could not pass linking stage with 2.1.18f version
> (included into 2.6.1 kernel patch).
> The linker complains that :
> drivers/built-in.o(.init.text+0x8cec): In function 'sym2_probe':
> : undfined reference to 'local symbols in discarded section .exit.text'
>
> I compared arch/alpha/kernel/vmlinux.lds.S with one from the i386 tree.
> The '.exit.text' and '.exit.data'
> sections were moved out of DISCARD attributes in the i386 version. I did
> the same with alpha version
> and it helped.

Thanks for this report; you uncovered a real bug.  Actually two real
bugs; one is that parisc is not discarding the .init.text and .exit.text
sections (so I didn't notice this bug) and the other is that sym_detach
is marked __devexit, yet called from a __devinit function.

Uses the new module_params that nobody else uses now.

to generate the duplicate area at 0x0000 and 0x100000.

There's no downside to it, so allow it even though it's
a tad strange.

On Wed, Jan 07, 2004 at 11:28:31PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.1-rc1-mm2:
>...
> -qla1280-update.patch
> +qla1280-update-2.patch
>
>  Updated qlogic patch
>...

I got the following compile error when trying to compile this driver
statically into a kernel with hotplug enabled:


<--  snip  -->

...
drivers/scsi/qla1280.c:4849: error: `qla1280_remove_one' undeclared here
(not in a function)
drivers/scsi/qla1280.c:4849: error: initializer element is not constant
drivers/scsi/qla1280.c:4849: error: (near initialization for
`qla1280_pci_driver.remove')
make[2]: *** [drivers/scsi/qla1280.o] Error 1

<--  snip  -->


Since I don't see a good reason why qla1280_remove_one is #ifdef'ed out
in the non-modular case the patch below fixes this problem by removing
two #ifdef's.

Also note the fact that we're calling functions that may block,
while holding a local spinlock.

From: Geert Uytterhoeven <geert@linux-m68k.org>

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga NCR53c710: Coalesce all Amiga NCR53c710 SCSI host adapter configuration
options into one config option, as suggested by Matthew Wilcox.

From: Geert Uytterhoeven <geert@linux-m68k.org>

From: Geert Uytterhoeven <geert@linux-m68k.org>

ncr53c7xx: Cleanup prototypes for ncr53c7xx_init()

From: Geert Uytterhoeven <geert@linux-m68k.org>

Mac SCSI fixes (from Matthias Urlichs):
  - Inline functions need to be defined before being used.
  - out_8() takes an address and a value, not the other way round.

From: Geert Uytterhoeven <geert@linux-m68k.org>

Mac ESP SCSI: Update argument parsing (from Matthias Urlichs)

From: Anton Blanchard <anton@samba.org>