From: Linus Torvalds Date: Sat, 2 Apr 2016 23:48:37 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6c24df08255e24dbd19b52dd322f61fbc30b11d;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending Pull SCSI target fixes from Nicholas Bellinger: "This includes fixes from HCH for -rc1 configfs default_groups conversion changes that ended up breaking some iscsi-target default_groups, along with Sagi's ib_drain_qp() conversion for iser-target to use the common caller now available to RDMA kernel consumers in v4.6+ code" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: add a new add_wwn_groups fabrics method target: initialize the nacl base CIT begfore init_nodeacl target: remove ->fabric_cleanup_nodeacl iser-target: Use ib_drain_qp --- d6c24df08255e24dbd19b52dd322f61fbc30b11d