Meelis Roos
528c04ee6d
[SCSI] qlogicpti: fix timeout ...
qlogicpti times out for some tape library operations (like mtx
inventory). It seems SCSI command timeout is hardcoded into the driver.
Fix it by propagating the timeout from scsi request to the controller as
suggested by James Bottomley.
Tested on Sun Ultra 1 with Sun StorEdge L8 Autoloader.
Signed-off-by: Meelis Roos <mroos@linux.ee>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
2011-10-16 10:58:52 -05:00
Merge branch 'battery' into release
2011-08-05 22:16:42 -04:00
[SCSI] libsas,libata: fix ->change_queue_{depth|type} for sata devices
2011-10-02 12:30:30 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2011-08-17 13:15:25 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
2011-08-09 20:43:26 +02:00
drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
2011-08-02 12:43:50 +02:00
net: Compute protocol sequence numbers and fragment IDs using MD5.
2011-08-06 18:33:19 -07:00
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-07-23 10:34:47 -07:00
proc_fork_connector: a lockless ->real_parent usage is not safe
2011-07-28 18:26:32 -07:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-07-26 09:21:09 -07:00
cpuidle: stop depending on pm_idle
2011-08-03 19:06:37 -04:00
n2_crypto: Attach on Niagara-T3.
2011-07-28 01:30:07 -07:00
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-08-10 17:37:17 -07:00
i7core_edac: fixed typo in error count calculation
2011-08-18 14:07:15 -07:00
eisa/pci_eisa.c: fix BUG introduced by 005bdad7b8
2011-08-04 06:32:51 -10:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2011-08-21 18:13:19 -07:00
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2011-08-02 21:18:39 -10:00
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
2011-08-01 06:13:48 -10:00
drm/radeon: Extended DDC Probing for Toshiba L300D Radeon Mobility X1100 HDMI-A Connector
2011-08-23 13:24:55 +01:00
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
2011-07-22 22:47:08 +02:00
hwmon: (ibmaem) add missing kfree
2011-08-11 10:14:18 -07:00
i2c-eg20t : Fix the issue of Combined R/W transfer mode
2011-07-27 00:02:28 +01:00
drivers/ide/cy82c693.c: Add missing pci_dev_put
2011-08-04 01:30:34 -07:00
[SCSI] iscsi class: sysfs group is_visible callout for iscsi host attrs
2011-08-27 08:36:14 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-08-03 22:00:09 -10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-07-28 05:58:19 -07:00
arch/arm/mach-ux500/board-u5500.c: calibrate ALS input voltage
2011-07-25 20:57:15 -07:00
lguest: Fix in/out emulation
2011-07-22 14:39:51 +09:30
dm table: set flush capability based on underlying devices
2011-08-02 12:32:08 +01:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-30 00:08:53 -07:00
[SCSI] mptfusion: Added check for SILI bit in READ_16 CDB for DATA UNDERRUN ERRATA
2011-09-22 15:15:08 +04:00
mfd: Fix mismatch in twl4030 mutex lock-unlock
2011-07-31 23:28:27 +02:00
mmc: cb710: fix possible pci_dev leak in cb710_pci_configure()
2011-08-13 14:50:23 -04:00
mmc: dw_mmc: Fix DDR mode support.
2011-08-13 14:50:32 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2011-08-11 23:09:46 -07:00
NFC: pn533: use after free in pn533_disconnect()
2011-07-26 16:27:24 -04:00
Revert "dt: add of_alias_scan and of_alias_get_id"
2011-08-04 11:26:24 +01:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-07-25 23:09:27 -07:00
pci: fix new kernel-doc warning in pci.c
2011-08-20 18:02:32 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2011-07-31 06:23:08 -10:00
acer-wmi: support Lenovo ideapad S205 wifi switch
2011-08-05 15:21:52 -04:00
Merge 'akpm' patch series
2011-07-25 21:00:19 -07:00
s3c-adc-battery: Fix compilation error due to missing header (module.h)
2011-08-19 21:01:46 +04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2011-08-01 14:05:46 -10:00
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-08-17 10:28:33 -07:00
[SCSI] zfcp: support for hardware data router
2011-08-27 08:37:03 -06:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
[SCSI] qlogicpti: fix timeout
2011-10-16 10:58:52 -05:00
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
2011-08-01 06:10:16 -10:00
spi/pl022: remove function cannot exit
2011-08-02 14:54:11 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
gma500: kill MIPI interface types
2011-08-16 07:22:16 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2011-08-03 15:12:09 -10:00
thermal: make THERMAL_HWMON implementation fully internal
2011-08-02 14:51:57 -04:00
sh: Fix boot crash related to SCI
2011-08-07 15:51:45 -07:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
2011-08-10 22:11:45 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
savagedb: Fix typo causing regression in savage4 series video chip detection
2011-08-06 12:02:40 -07:00
drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
2011-07-22 09:24:39 -05:00
virtio: expose for non-virtualization users too
2011-07-23 16:20:30 +09:30
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
watchdog: Cleanup WATCHDOG_CORE help text
2011-08-02 08:23:07 +00:00
xen: self-balloon needs module.h
2011-08-16 07:23:34 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-07-25 22:59:39 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-07-25 22:59:39 -07:00
528c04ee6d