From: Linus Torvalds Date: Fri, 11 May 2012 23:49:09 +0000 (-0700) Subject: Merge branch '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target... X-Git-Tag: v3.4-rc7~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04e53358ec23b836af5c5718d1c368ba23abc2c2;p=platform%2Fkernel%2Flinux-stable.git Merge branch '3.4-urgent' of git://git./linux/kernel/git/nab/target-pending Pull target fix from Nicholas Bellinger: "This patch removes some incorrect legacy code to free se_lun_acl memory in the NodeACL release path that could potentially trigger an OOPS during shutdown once dynamic -> explicit initiator NodeACL conversion has occurred. That said, we've been able to trigger an OOPS in v4.0 code for this special case when the associated MappedLUNs had not also been made explicit based on active TPG LUN layout during the conversion, so it really makes senses to go ahead and drop this extra cruft to avoid any possible issues here. This ends up only effecting iscsi-target module code (it's the only user) and is CC'ed to stable." * '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: Drop incorrect se_lun_acl release for dynamic -> explict ACL conversion --- 04e53358ec23b836af5c5718d1c368ba23abc2c2