From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Jun 2013 18:54:06 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
X-Git-Tag: v4.0~3851
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67e5b2fad4e9848a954fd97de0509ec5cb6e6d47;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "Included is the recent tcm_qla2xxx residual underrun length fix from
  Roland, along with Joern's iscsi-target patch for session_lock
  breakage within iscsit_stop_time2retain_timer() code.  Both are CC'ed
  to stable.

  The remaining two are specific to recent iscsi-target + iser
  conversion changes.  One drops some left-over debug noise, and Andy's
  patch fixes configfs attribute handling during an explicit network
  portal feature bit disable when iser-target is unsupported."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  iscsi-target: Remove left over v3.10-rc debug printks
  target/iscsi: Fix op=disable + error handling cases in np_store_iser
  tcm_qla2xxx: Fix residual for underrun commands that fail
  target/iscsi: don't corrupt bh_count in iscsit_stop_time2retain_timer()
---

67e5b2fad4e9848a954fd97de0509ec5cb6e6d47