Commit 7fcd473a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "A few late arriving patches that missed the initial pull request. It's
  mostly bug fixes (the dt-bindings is a fix for the initial pull)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: core: Remove unused function declaration
  scsi: target: docs: Remove tcm_mod_builder.py
  scsi: target: iblock: Quiet bool conversion warning with pr_preempt use
  scsi: dt-bindings: ufs: qcom: Fix ICE phandle
  scsi: core: Simplify scsi_cdl_check_cmd()
  scsi: isci: Fix comment typo
  scsi: smartpqi: Replace one-element arrays with flexible-array members
  scsi: target: tcmu: Replace strlcpy() with strscpy()
  scsi: ncr53c8xx: Replace strlcpy() with strscpy()
  scsi: lpfc: Fix lpfc_name struct packing
parents 84dc5aa3 24033d71

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

+4 −5
Original line number Diff line number Diff line
@@ -194,9 +194,8 @@ allOf: 
    # TODO: define clock bindings for qcom,msm8994-ufshc



  - if:

      properties:

        qcom,ice:

          maxItems: 1

      required:

        - qcom,ice

    then:

      properties:

        reg:
@@ -207,10 +206,10 @@ allOf: 
    else:

      properties:

        reg:

          minItems: 2

          minItems: 1

          maxItems: 2

        clocks:

          minItems: 9

          minItems: 8

          maxItems: 11



unevaluatedProperties: false

Documentation/target/scripts.rst

+0 −6
Original line number Diff line number Diff line 
TCM mod builder script

----------------------



.. literalinclude:: tcm_mod_builder.py

    :language: perl



Target export device script

---------------------------

Documentation/target/tcm_mod_builder.py

deleted100755 → 0
+0 −656

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/scsi/isci/scu_task_context.h

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ struct scu_task_context { 


	/**

	 * This field is used by the SCU TL to determine when to take a snapshot when

	 * tranmitting read data frames.

	 * transmitting read data frames.

	 *    - 0x00 The entire IO

	 *    - 0x01 32k

	 *    - 0x02 64k

drivers/scsi/lpfc/lpfc_hw.h

+5 −5
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ struct lpfc_name { 
			uint8_t IEEE[6];	/* FC IEEE address */

		} s;

		uint8_t wwn[8];

		uint64_t name;

		uint64_t name __packed __aligned(4);

	} u;

};
@@ -850,7 +850,7 @@ typedef struct _ADISC { /* Structure is in Big Endian format */ 
	struct lpfc_name portName;

	struct lpfc_name nodeName;

	uint32_t DID;

} __packed ADISC;

} ADISC;



typedef struct _FARP {		/* Structure is in Big Endian format */

	uint32_t Mflags:8;
@@ -880,7 +880,7 @@ typedef struct _FAN { /* Structure is in Big Endian format */ 
	uint32_t Fdid;

	struct lpfc_name FportName;

	struct lpfc_name FnodeName;

} __packed FAN;

} FAN;



typedef struct _SCR {		/* Structure is in Big Endian format */

	uint8_t resvd1;
@@ -924,7 +924,7 @@ typedef struct _RNID { /* Structure is in Big Endian format */ 
	union {

		RNID_TOP_DISC topologyDisc;	/* topology disc (0xdf) */

	} un;

} __packed RNID;

} RNID;



struct RLS {			/* Structure is in Big Endian format */

	uint32_t rls;
@@ -1514,7 +1514,7 @@ struct lpfc_fdmi_hba_ident { 
struct lpfc_fdmi_reg_port_list {

	__be32 EntryCnt;

	struct lpfc_fdmi_port_entry pe;

} __packed;

};



/*

 * Register HBA(RHBA)