From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On Wed, 26 May 2004, Christoph Hellwig wrote:
> On Sun, May 23, 2004 at 11:19:58PM +0200, Guennadi Liakhovetski wrote:
> >
> > Whereas, DCBCnt is incremented on slave_alloc, decremented on
> > slave_destroy and used in a couple more places. So, is it safe to assume
> > that DeviceCnt is redundant and remove it in a next patch?... Then it
> > might be already safe to move scan_devices as you suggest?
>
> Looks like a way to go.  I'm not sure what scan_device is supposed to
> do as I already wrote, but from looking at when it's set/cleared I'm
> pretty sure it tries to indicate whethere we're currently scanning for
> devices.  And useing slave_alloc/slave_configure is a much safer way to
> find that out then guessing from the commands sent.

So, here's the first one - remove DeviceCnt.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The "API-update" patch, just approved by Christoph deserves a new version.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Should be FORCELUN not SPARSELUN ?
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

ATech 9-in-1 card reader.
Cbox 3 5 1/2 bay with 6in1 card reader
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Alan Cox <alan@redhat.com>

In 2.4 the megaraid driver was careful to avoid stepping on wrong devices.
Specifically the megaraid3 series devices used an intel pci ID (8086:1960)
which is the generic i960 identifier not their own.

The code to do this in 2.4 worked for almost all cases, but even that code has
mysteriously vanished in 2.6 meaning the megaraid driver trashes stuff like
promise i2o cards and compaq management cards.

The following patch puts back the 2.4 stuff + one additional check so that the
driver isn't quite as rude as it was before.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/qla1280.c:3124: warning: `qla1280_64bit_start_scsi' defined but not used
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

blk_insert_request will do the right thing and either unplug the queue or
call the request_fn, so users of scsi_do_req do not need to call
generic_unplug_device themselves. The attached patch just removes that
call from scsi_lib.c and the sg driver after they do a scsi_do_req.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: "Moore, Eric Dean" <Emoore@lsil.com>

Clean up backword compatibility with 2.4 kernel and older. Patch
provided by Christoph Hellwig<hch@lst.de,hch@infradead.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

For more info see Red Hat bugzilla entries #85851 and #124048
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

This patch closes a window where if a device had a cancel all
outstanding as a result of a check condition and the adapter
was reset for some reason, a request sense would still be issued,
which would end up timing out and issuing an additional adapter
reset. It could also result in a leak of command blocks, depending
on when it timed out.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

From: 	Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Update the driver to use the new pci, scsi and
module interfaces.

Modified with feedback from hch
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

 - give the constants.c prettyprinting helpers proper scsi_ prefixed
   names (and keep compat versions for 2.6.x)
 - move them to include/scsi/scsi_dbg.h so now really only legacy stuff
   is left in drivers/scsi/scsi.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch to radeonfb fixes support for the latest iBook models along
with an initialisation problem on some IGP chipsets. Please apply.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Sparse found an instance where we were directly dereferencing a
userspace pointer in the signal handling code.  This change
fixes that.

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

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

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

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

Cset exclude: akpm@osdl.org[torvalds]|ChangeSet|20040510205830|02933

From: Christoph Hellwig <hch@lst.de>

All watchdog drivers need linux/fs.h

This patch also removes the cbar usage which is unnecessary. The MMCR is
always available at 0xfffef000; there is no need to use the cbar register
(if mmcr aliasing is enabled, then the MMCR is _also_ available at
another address set by CBAR).

Clean-up (general stuff: comments, keep module parameters together, ...)
Added clear definitions for the Watchdog Timer Control Register bits
Made start, stop and keepalive return 0 if successful
Fixed nowayout behaviour so that it is consistent with other watchdog drivers
Fixed release behaviour so that it is consistent with other watchdog drivers
Added wdt_set_heartbeat function to set the timeout/heartbeat of the watchdog
Made sure that memory remapping (wdtmrctl) is done before misc_register is started
MMCR_BASE_DEFAULT was wrong (Bug 2497 reported by Sean Young)

Tested by Sean Young

When drivers starts show the correct watchdog driver info.

into kroah.com:/home/greg/linux/BK/i2c-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

This is a driver for "Remote/Local Temperature Sensor with Dual-Alarm Outputs
and SMBus Serial Interface" MAX1619. I found this chip an my Laptop SAMSUNG
NV5000. Daryng I use Linux cooling didn't worked at all, naw  with this
driwer it's working. I hope  this will be usefool for ather too.

I didn't hade any expiriens with programming, but i didn't wont to wait wann
some body make it vor me. Jean halped me correrct any mysteiks wich i made.
Thanks Jaen :)
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The following patch adds support for the ADM1030 and ADM1031 evaluation
boards to the i2c-parport and i2c-parport-light drivers. They are almost
compatible with the already supported ADM1025 and ADM1032 boards, except
that the ADM1032 board needs some pins to be set high to draw its power,
while the same pins power up heating resistors on the ADM1031 board. I
considered it was a bit dangerous to do that by default, so I ended up
with two different device definitions, one with powering pins set, and
one with these pins cleared.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 In drivers/pci/probe.c::pci_scan_bridge() the call for pci_alloc_child_bus()
can return NULL, but it is not handled by the function (detected by
Coverity's checker).

 The patch bellow fix that returning `max' if we got the NULL, but
I do not know if it is right. I guess it is, because in that case
the function will act in the same way as with `pass != 0'.

Signed-off by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

We would like to have the InfiniCon PCI Vendor ID added to pci_ids.h
Below is a context diff, which would would greatly appreciate if you
applied and included in future kernel releases.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch fixes throttling problems in the ftdi_sio driver for the
2.6 kernel.  The old throttling mechanism (unlinking the read urb)
often failed to work, and even it did work, would lose any data
held in the transfer buffer.  The new mechanism presented here is
based on what the whitehead driver does (defer processing and
resubmitting of the read urb until unthrottled).
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch changes the return codes used by hub_port_wait_reset(),
hub_port_reset(), and hub_port_debounce() in hub.c.  I couldn't stand the
{-1=error, 0=okay, 1=disconnect} scheme; the meanings seemed arbitrary and
I constantly forgot which number stood for what status.  The revised code
uses normal negative error codes, including -ENOTCONN to indicate device
disconnected, or 0 for success.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

A patch to fix my previous
leave-runtime-suspended-devices-off-at-system-resume patch; the new
changes save a copy of power.power_state in order to know whether to
resume a device, independently of mods to that field by a driver suspend
routine.  This fixes 2.6.7-rc1-mm1 in the same fashion as the updated
2.6.6 patch sent previously.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/driver-2.6

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/pci-2.6