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

Commit d5db84a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'scsi-target-for-v4.10' of... 

Merge branch 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux

Pull scsi target cleanups from Bart Van Assche:
 "The changes here are:

   - a few small bug fixes for the iSCSI and user space target drivers.

   - minimize the target build time by about 30% by rearranging #include
     directives

   - fix the second argument passed to percpu_ida_alloc()

   - reduce the number of false positive warnings reported by sparse

  These patches pass Wu Fengguang's build bot tests and also the
  linux-next tests"

* 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux:
  iscsi-target: Return error if unable to add network portal
  target: Fix spelling mistake and unwrap multi-line text
  target/iscsi: Fix double free in lio_target_tiqn_addtpg()
  target/user: Fix use-after-free of tcmu_cmds if they are expired
  target: Minimize #include directives
  target/user: Add an #include directive
  cxgbit: Add an #include directive
  ibmvscsi_tgt: Add two #include directives
  sbp-target: Add an #include directive
  qla2xxx: Add an #include directive
  configfs: Minimize #include directives
  usb: gadget: Fix second argument of percpu_ida_alloc()
  sbp-target: Fix second argument of percpu_ida_alloc()
  target/user: Fix a data type in tcmu_queue_cmd()
  target: Use NULL instead of 0 to represent a pointer
parents f8114f85 83337e54

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/types.h>

#include <linux/list.h>

#include <linux/string.h>

#include <linux/delay.h>



#include <target/target_core_base.h>

#include <target/target_core_fabric.h>

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#ifndef __H_IBMVSCSI_TGT

#define __H_IBMVSCSI_TGT



#include <linux/interrupt.h>

#include "libsrp.h"



#define SYS_ID_NAME_LEN		64

drivers/scsi/qla2xxx/qla_isr.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/t10-pi.h>

#include <scsi/scsi_tcq.h>

#include <scsi/scsi_bsg_fc.h>

#include <scsi/scsi_eh.h>

drivers/target/iscsi/cxgbit/cxgbit_target.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/workqueue.h>

#include <linux/kthread.h>

#include <asm/unaligned.h>

#include <net/tcp.h>

#include <target/target_core_base.h>

#include <target/target_core_fabric.h>

#include "cxgbit.h"

drivers/target/iscsi/iscsi_target.c

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
#include <linux/module.h>

#include <linux/vmalloc.h>

#include <linux/idr.h>

#include <linux/delay.h>

#include <asm/unaligned.h>

#include <net/ipv6.h>

#include <scsi/scsi_proto.h>

#include <scsi/iscsi_proto.h>

#include <scsi/scsi_tcq.h>