From: Linus Torvalds Date: Mon, 28 Oct 2013 23:57:13 +0000 (-0700) Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi X-Git-Tag: MMI-PSA29.97-13-9~13403 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d914a959d251601ee8be4a1363f93e9d8ba4081;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: "This is a set of four patches that revert functionality introduced in the merge window to sg. The locking changes turned out to introduce this bug: [ 205.372901] [ BUG: lock held when returning to user space! ] [...] [ 205.373285] #0: (&sdp->o_sem){.+.+..}, at: [] sg_open+0x3a0/0x4d0 The fix is large, so at this late stage we'd like to revert the functionality and start again in the next merge window" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] Revert "sg: use rwsem to solve race during exclusive open" [SCSI] Revert "sg: no need sg_open_exclusive_lock" [SCSI] Revert "sg: checking sdp->detached isn't protected when open" [SCSI] Revert "sg: push file descriptor list locking down to per-device locking" --- 5d914a959d251601ee8be4a1363f93e9d8ba4081