Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

Pull SCSI target updates from Nicholas Bellinger:
 "It's been a busy development cycle for target-core in a number of
  different areas.

  The fabric API usage for se_node_acl allocation is now within
  target-core code, dropping the external API callers for all fabric
  drivers tree-wide.

  There is a new conversion to RCU hlists for se_node_acl and
  se_portal_group LUN mappings, that turns fast-past LUN lookup into a
  completely lockless code-path.  It also removes the original
  hard-coded limitation of 256 LUNs per fabric endpoint.

  The configfs attributes for backends can now be shared between core
  and driver code, allowing existing drivers to use common code while
  still allowing flexibility for new backend provided attributes.

  The highlights include:

   - Merge sbc_verify_dif_* into common code (sagi)
   - Remove iscsi-target support for obsolete IFMarker/OFMarker
     (Christophe Vu-Brugier)
   - Add bidi support in target/user backend (ilias + vangelis + agover)
   - Move se_node_acl allocation into target-core code (hch)
   - Add crc_t10dif_update common helper (akinobu + mkp)
   - Handle target-core odd SGL mapping for data transfer memory
     (akinobu)
   - Move transport ID handling into target-core (hch)
   - Move task tag into struct se_cmd + support 64-bit tags (bart)
   - Convert se_node_acl->device_list[] to RCU hlist (nab + hch +
     paulmck)
   - Convert se_portal_group->tpg_lun_list[] to RCU hlist (nab + hch +
     paulmck)
   - Simplify target backend driver registration (hch)
   - Consolidate + simplify target backend attribute implementations
     (hch + nab)
   - Subsume se_port + t10_alua_tg_pt_gp_member into se_lun (hch)
   - Drop lun_sep_lock for se_lun->lun_se_dev RCU usage (hch + nab)
   - Drop unnecessary core_tpg_register TFO parameter (nab)
   - Use 64-bit LUNs tree-wide (hannes)
   - Drop left-over TARGET_MAX_LUNS_PER_TRANSPORT limit (hannes)"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (76 commits)
  target: Bump core version to v5.0
  target: remove target_core_configfs.h
  target: remove unused TARGET_CORE_CONFIG_ROOT define
  target: consolidate version defines
  target: implement WRITE_SAME with UNMAP bit using ->execute_unmap
  target: simplify UNMAP handling
  target: replace se_cmd->execute_rw with a protocol_data field
  target/user: Fix inconsistent kmap_atomic/kunmap_atomic
  target: Send UA when changing LUN inventory
  target: Send UA upon LUN RESET tmr completion
  target: Send UA on ALUA target port group change
  target: Convert se_lun->lun_deve_lock to normal spinlock
  target: use 'se_dev_entry' when allocating UAs
  target: Remove 'ua_nacl' pointer from se_ua structure
  target_core_alua: Correct UA handling when switching states
  xen-scsiback: Fix compile warning for 64-bit LUN
  target: Remove TARGET_MAX_LUNS_PER_TRANSPORT
  target: use 64-bit LUNs
  target: Drop duplicate + unused se_dev_check_wce
  target: Drop unnecessary core_tpg_register TFO parameter
  ...

diff --cc Documentation/target/tcm_mod_builder.py
index 6085e1f19c9d59fa49b5a3d4d369da6426ae526e,c70b193ec1106bfebda839c643ba67d69510cd8f..949de191fcdc1939c9b160eb7a809afcdbc847af
--- 1/Documentation/target/tcm_mod_builder.py
--- 2/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@@ -503,11 -409,13 +409,10 @@@ def tcm_mod_dump_fabric_ops(proto_ident
        buf += "#include <linux/string.h>\n"
        buf += "#include <linux/ctype.h>\n"
        buf += "#include <asm/unaligned.h>\n"
 -      buf += "#include <scsi/scsi.h>\n"
 -      buf += "#include <scsi/scsi_host.h>\n"
 -      buf += "#include <scsi/scsi_device.h>\n"
 -      buf += "#include <scsi/scsi_cmnd.h>\n"
 -      buf += "#include <scsi/libfc.h>\n\n"
 +      buf += "#include <scsi/scsi_common.h>\n"
 +      buf += "#include <scsi/scsi_proto.h>\n"
        buf += "#include <target/target_core_base.h>\n"
        buf += "#include <target/target_core_fabric.h>\n"
-       buf += "#include <target/target_core_configfs.h>\n\n"
        buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
        buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
  

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_tmr.c
Simple merge

diff --cc drivers/target/sbp/sbp_target.c
Simple merge

diff --cc drivers/target/target_core_alua.c
Simple merge

diff --cc drivers/target/target_core_device.c
Simple merge

diff --cc drivers/target/target_core_fabric_lib.c
Simple merge

diff --cc drivers/target/target_core_file.c
Simple merge

diff --cc drivers/target/target_core_iblock.c
Simple merge

diff --cc drivers/target/target_core_pr.c
Simple merge

diff --cc drivers/target/target_core_pscsi.c
Simple merge

diff --cc drivers/target/target_core_rd.c
Simple merge

diff --cc drivers/target/target_core_sbc.c
Simple merge

diff --cc drivers/target/target_core_spc.c
Simple merge

diff --cc drivers/target/target_core_stat.c
Simple merge

diff --cc drivers/target/target_core_tmr.c
Simple merge

diff --cc drivers/target/target_core_tpg.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/target_core_ua.c
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc drivers/target/target_core_xcopy.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_conf.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_io.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_sess.c
Simple merge

diff --cc drivers/usb/gadget/legacy/tcm_usb_gadget.c
Simple merge

diff --cc drivers/usb/gadget/legacy/tcm_usb_gadget.h
Simple merge

diff --cc drivers/vhost/scsi.c
Simple merge

diff --cc drivers/xen/xen-scsiback.c
Simple merge

diff --cc include/target/iscsi/iscsi_target_core.h
Simple merge

diff --cc include/target/target_core_base.h
index aec6f6a4477c79454af758817537dd8d3a3300b8,0b9a331e5492dbdeab6be33e742f724b535219e9..17ae2d6a4891e57245c16fbeb4e2a8a6462d32d0
--- 1/include/target/target_core_base.h
--- 2/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@@ -9,15 -9,20 +9,11 @@@
  #include <net/sock.h>
  #include <net/tcp.h>
  
- #define TARGET_CORE_MOD_VERSION               "v4.1.0"
- #define TARGET_CORE_VERSION           TARGET_CORE_MOD_VERSION
+ #define TARGET_CORE_VERSION           "v5.0"
  
- /* Maximum Number of LUNs per Target Portal Group */
- /* Don't raise above 511 or REPORT_LUNS needs to handle >1 page */
- #define TRANSPORT_MAX_LUNS_PER_TPG            256
  /*
 - * By default we use 32-byte CDBs in TCM Core and subsystem plugin code.
 - *
 - * Note that both include/scsi/scsi_cmnd.h:MAX_COMMAND_SIZE and
 - * include/linux/blkdev.h:BLOCK_MAX_CDB as of v2.6.36-rc4 still use
 - * 16-byte CDBs by default and require an extra allocation for
 - * 32-byte CDBs to because of legacy issues.
 - *
 - * Within TCM Core there are no such legacy limitiations, so we go ahead
 - * use 32-byte CDBs by default and use include/scsi/scsi.h:scsi_command_size()
 - * within all TCM Core and subsystem plugin code.
 + * Maximum size of a CDB that can be stored in se_cmd without allocating
 + * memory dynamically for the CDB.
   */
  #define TCM_MAX_COMMAND_SIZE                  32
  /*