From: Linus Torvalds Date: Wed, 31 Oct 2012 22:42:08 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1e207eb1c3f0e8b690401f02fe08e7b53903f010;p=openwrt%2Fstaging%2Fblogic.git Merge git://git./linux/kernel/git/nab/target-pending Pull scsi target fixes from Nicholas Bellinger: "These are the current target pending fixes headed for v3.7-rc4 code. This includes the following highlights: - Fix long-standing qla2xxx target bug where certain fc_port_t state transitions could cause the internal session b-tree list to become out-of-sync. (Roland) - Fix task management double free of se_cmd descriptor in exception path for users of target_submit_tmr(). (nab) - Re-introduce simple NOP emulation of REZERO_UNIT, SEEK_6, and SEEK_10 SCSI-2 commands in order to support legacy initiators that still require them. (Bernhard) Note these three patches are also CC'ed to stable. Also, there a couple of outstanding (external) regressions that are still being tracked down for tcm_fc(FCoE) and tcm_vhost fabrics for v3.7.0 code, so please expect another PULL as these issues identified -> resolved." * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: reintroduce some obsolete SCSI-2 commands target: Fix double-free of se_cmd in target_complete_tmr_failure qla2xxx: Update target lookup session tables when a target session changes tcm_qla2xxx: Format VPD page 83h SCSI name string according to SPC qla2xxx: Add missing ->vport_slock while calling qlt_update_vp_map --- 1e207eb1c3f0e8b690401f02fe08e7b53903f010