Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f96e0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (38 commits)
  target: Bump version to v4.1.0-rc1-ml
  target: remove custom hex2bin() implementation
  target: fix typo Assoication -> Association
  target: Update QUEUE ALGORITHM MODIFIER control page default
  target: ->map_task_SG conversion to ->map_control_SG and ->map_data_SG
  target: Follow up core updates from AGrover and HCH (round 4)
  target: Eliminate usage of struct se_mem
  target: Pass 2nd param of transport_split_cdb by value
  target: Enforce 1 page max for control cdb buffer sizes
  target: Make all control CDBs scatter-gather
  target: Implement Block Device Characteristics VPD page
  target: Fix reporting of supported VPD pages
  target: Allow for built-in target modules
  tcm_fc: Convert to wake_up_process and schedule_timeout_interruptible
  tcm_fc: Makefile cleanups
  loopback: Fix memory leak in tcm_loop_make_scsi_hba()
  loopback: Remove duplicate scsi/scsi_tcq.h include
  loopback: off by one in tcm_loop_make_naa_tpg()
  target/iblock: Remove unused iblock_dev members
  target/iblock: Use request_queue->nr_request for se_device defaults
  ...
parents 17413f5a fa495159

drivers/target/loopback/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ config LOOPBACK_TARGET 
	help

	  Say Y here to enable the TCM Virtual SAS target and Linux/SCSI LLD

	  fabric loopback module.
 


config LOOPBACK_TARGET_CDB_DEBUG

	bool "TCM loopback fabric module CDB debug code"

	depends on LOOPBACK_TARGET

	help

	  Say Y here to enable the TCM loopback fabric module CDB debug code

drivers/target/loopback/tcm_loop.c

+84 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/target/loopback/tcm_loop.h

+0 −6
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ 
 */

#define TL_SCSI_MAX_CMD_LEN		32



#ifdef CONFIG_LOOPBACK_TARGET_CDB_DEBUG

# define TL_CDB_DEBUG(x...)		printk(KERN_INFO x)

#else

# define TL_CDB_DEBUG(x...)

#endif



struct tcm_loop_cmd {

	/* State of Linux/SCSI CDB+Data descriptor */

	u32 sc_cmd_state;

drivers/target/target_core_alua.c

+227 −199

File changed.

Preview size limit exceeded, changes collapsed.

drivers/target/target_core_cdb.c

+273 −184

File changed.

Preview size limit exceeded, changes collapsed.