diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-30 16:13:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-30 16:13:05 -0400 |
| commit | 13d2080db3472b3399ba32e6026960de5d32a344 (patch) | |
| tree | 8df5d34c2601559f911fd35d9c4e4da68a5efeee /include/linux/xz.h | |
| parent | 46a1f21a679abaaeae6db9969963dc998c9f1c1c (diff) | |
| parent | f85eda8d75d37a3796cee7f5a906e50e3f13d9e1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull SCSI target fixes from Nicholas Bellinger:
"This includes the bug-fix for a >= v3.8-rc1 regression specific to
iscsi-target persistent reservation conflict handling (CC'ed to
stable), and a tcm_vhost patch to drop VIRTIO_RING_F_EVENT_IDX usage
so that in-flight qemu vhost-scsi-pci device code can detect the
proper vhost feature bits.
Also, there are two more tcm_vhost patches still being discussed by
MST and Asias for v3.9 that will be required for the in-flight qemu
vhost-scsi-pci device patch to function properly, and that should
(hopefully) be the last target fixes for this round."
* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
Diffstat (limited to 'include/linux/xz.h')
0 files changed, 0 insertions, 0 deletions