Linus Torvalds
d753856c9f
SCSI fixes on 20150102 ...
This is a set of three fixes: one to correct an abort path thinko causing
failures (and a panic) in USB on device misbehaviour, One to fix an out of
order issue in the fnic driver and one to match discard expectations to qemu
which otherwise cause Linux to behave badly as a guest.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABAgAGBQJUpsmHAAoJEDeqqVYsXL0MdToH/1UsmOdtxNh6AfBDWWYi45o8
kBno1gTnRrDgIlOiRu+BtmL25A1rNcCdCQKjG6JBEBruqUVAwZztktGjfuSvso6s
EYbrnE+5DmDs6cW8pp6GK3QGV+R+AmbT8oBbe/Kpg5LdTsdnQOozSycUp7X3XgTi
pLOm6rW/AgEV1QFcQz1bjI6cnbcOZMcGZnC5qwphiKgBnVYd+PZY24RSHDKCu/va
z2lsa5yqXFHKZZZRhYG343YqCTf3Dkph78124JoNvVm3EjO+GQAAiojiUa7l59UF
RqNRqeMxfz2cPmBnJxbNmWiP1YQGBgOaNDRgc7D7SPxaMwUe9444Gm4MkoZWzmQ=
=706l
-----END PGP SIGNATURE-----
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of three fixes: one to correct an abort path thinko
causing failures (and a panic) in USB on device misbehaviour, One to
fix an out of order issue in the fnic driver and one to match discard
expectations to qemu which otherwise cause Linux to behave badly as a
guest"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
SCSI: fix regression in scsi_send_eh_cmnd()
fnic: IOMMU Fault occurs when IO and abort IO is out of order
sd: tweak discard heuristics to work around QEMU SCSI issue
2015-01-02 13:24:41 -08:00
Merge branch 'acpi-video'
2014-12-29 21:24:13 +01:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Merge branches 'pm-domains', 'powercap' and 'pm-tools'
2014-12-29 21:24:00 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-12-11 17:56:37 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-12-17 16:03:12 -08:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2014-12-15 13:23:09 -05:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2014-12-25 16:04:15 -08:00
Please consider pulling the clk framework changes toward 3.19. It is
2014-12-20 16:42:36 -08:00
Fixes for 3.19
2014-12-30 15:27:20 +01:00
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
2014-12-29 21:23:41 +01:00
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
2014-12-29 21:23:41 +01:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
firewire: sbp2: replace card lock by target lock
2014-12-10 20:53:21 +01:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"
2014-12-24 13:13:22 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-12-12 10:26:47 -08:00
* misc. fixes in omap-ssi and nokia-modem drivers
2014-12-15 17:33:47 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-12-17 10:16:27 -08:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-12-20 13:52:52 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Staging patches for 3.19-rc1
2014-12-15 18:06:13 -08:00
SCSI for-linus on 20141220
2014-12-20 13:42:57 -08:00
Revert "Input: atmel_mxt_ts - use deep sleep mode when stopped"
2014-12-31 12:59:34 -08:00
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-19 14:02:02 -08:00
Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-15 17:30:09 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
virtio: allow finalize_features to fail
2014-12-09 16:32:32 +02:00
macintosh: therm_pm72: delete deprecated driver
2014-12-19 19:32:47 +01:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
dm: fix missed error code if .end_io isn't implemented by target_type
2014-12-17 12:31:13 -05:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
MTD updates for 3.19:
2014-12-17 09:59:26 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-12-30 16:59:59 -08:00
powerpc updates for 3.19 batch 2
2014-12-19 12:57:45 -08:00
mmc: core: stop trying to switch width when only one bit is supported
2014-12-29 14:49:28 +01:00
MTD updates for 3.19:
2014-12-17 09:59:26 -08:00
ne2k-pci: Add pci_disable_device in error handling
2014-12-27 02:20:55 -05:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
ARM: SoC/iommu configuration for 3.19
2014-12-16 14:53:01 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-19 14:02:02 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
platform-drivers-x86 for 3.19
2014-12-18 20:24:55 -08:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
powercap / RAPL: add IDs for future Xeon CPUs
2014-12-17 02:35:42 +01:00
pwm: Changes for v3.19-rc1
2014-12-17 10:10:51 -08:00
regulator: Fix for v3.19
2014-12-29 13:24:38 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
SCSI: fix regression in scsi_send_eh_cmnd()
2014-12-30 08:59:13 -08:00
drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-05 03:08:24 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus
2014-12-24 12:57:54 +00:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-12-11 17:56:37 -08:00
[regression] braino in "lustre: use is_root_inode()"
2014-12-26 22:43:19 -05:00
SCSI for-linus on 20141220
2014-12-20 13:42:57 -08:00
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
2014-12-24 10:38:30 +08:00
tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 15:27:58 +01:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
SCSI for-linus on 20141220
2014-12-20 13:42:57 -08:00
VFIO updates for v3.19-rc1
2014-12-17 10:44:22 -08:00
vhost: relax used address alignment
2014-12-29 10:55:06 +02:00
OMAPDSS: SDI: fix output port_num
2014-12-30 11:18:30 +02:00
vhost/virtio: virtio 1.0 related fixes
2014-12-18 20:50:30 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
watchdog: imx2_wdt: Fix the argument of watchdog_active()
2014-12-18 16:01:20 +01:00
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
2014-12-18 05:56:29 -08:00
Staging patches for 3.19-rc1
2014-12-15 18:06:13 -08:00
Staging patches for 3.19-rc1
2014-12-15 18:06:13 -08:00
d753856c9f