Skip to contentSkip to conversation

zfcp changes for v5.20

PATCH Applied Benjamin Block 2 participants 6 messages Jul 6, 2022 – Jul 14, 2022

Subsystems (3)
lore
Share & tools
lore
#1 lore raw

PATCH 1/2 scsi: zfcp: declare zfcp_sdev_attrs as static

In reply to Benjamin Block

From: Julian Wiedmann <[email protected]>

These attributes are now only accessed through the zfcp_sysfs_sdev_attr_group.

Fixes d8d7cf3f7d07 ("scsi: zfcp: Switch to attribute groups")
---
 drivers/s390/scsi/zfcp_sysfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/scsi/zfcp_sysfs.c +1 -1
index dbf3e50444e6..cb67fa80fb12 100644
@@ -672,7 +672,7 @@ ZFCP_DEFINE_SCSI_ATTR(zfcp_in_recovery, "%d\n",
 ZFCP_DEFINE_SCSI_ATTR(zfcp_status, "0x%08x\n",
 		      atomic_read(&zfcp_sdev->status));
 
-struct attribute *zfcp_sdev_attrs[] = {
+static struct attribute *zfcp_sdev_attrs[] = {
 	&dev_attr_fcp_lun.attr,
 	&dev_attr_wwpn.attr,
 	&dev_attr_hba_id.attr,
Signature · 1 line
2.36.1
#2 lore raw

PATCH 2/2 scsi: zfcp: drop unexpected word "the" in the comments

In reply to Benjamin Block

From: Jiang Jian <[email protected]>

there is an unexpected word "the" in the comments that need to be dropped

file: ./drivers/s390/scsi/zfcp_diag.h
line: 5
* Definitions for handling diagnostics in the the zfcp device driver. changed to
* Definitions for handling diagnostics in the zfcp device driver.

---
 drivers/s390/scsi/zfcp_diag.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/scsi/zfcp_diag.h +1 -1
index da55133da8fe..15c25fefe91a 100644
@@ -2,7 +2,7 @@
 /*
  * zfcp device driver
  *
- * Definitions for handling diagnostics in the the zfcp device driver.
+ * Definitions for handling diagnostics in the zfcp device driver.
  *
  * Copyright IBM Corp. 2018, 2020
  */
Signature · 1 line
2.36.1
#0 lore raw

cover zfcp changes for v5.20

Hello James, Martin,

here is a (very) small set of changes for the zFCP device driver. The change from Jiang Jian came in recently, and Julian's patch has been laying around for quite a while now, so I didn't want to let them linger any longer in anticipation of any bigger change that might come.

It would be nice, if you could include them for v5.20.

Jiang Jian (1):
scsi: zfcp: drop unexpected word "the" in the comments

Julian Wiedmann (1):
scsi: zfcp: declare zfcp_sdev_attrs as static

 drivers/s390/scsi/zfcp_diag.h  | 2 +-
 drivers/s390/scsi/zfcp_sysfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.36.1
#3 lore raw

Benjamin,

Quoted 5 lines

here is a (very) small set of changes for the zFCP device driver. The change from Jiang Jian came in recently, and Julian's patch has been laying around for quite a while now, so I didn't want to let them linger any longer in anticipation of any bigger change that might come.

Applied to 5.20/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#4 lore raw
Quoted 11 lines · Martin K. Petersen

Benjamin,

Quoted 5 lines

here is a (very) small set of changes for the zFCP device driver. The change from Jiang Jian came in recently, and Julian's patch has been laying around for quite a while now, so I didn't want to let them linger any longer in anticipation of any bigger change that might come.

Applied to 5.20/scsi-staging, thanks!

Thanks Martin.

Signature · 4 lines
Best Regards, Benjamin Block  / Linux on IBM Z Kernel Development / IBM Systems
IBM Deutschland Research & Development GmbH    /    https://www.ibm.com/privacy
Vorsitz. AufsR.: Gregor Pillen         /         Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294
#5 lore raw
In reply to Benjamin Block
Quoted 8 lines · Benjamin Block

here is a (very) small set of changes for the zFCP device driver. The change from Jiang Jian came in recently, and Julian's patch has been laying around for quite a while now, so I didn't want to let them linger any longer in anticipation of any bigger change that might come.

It would be nice, if you could include them for v5.20.

[...]

Applied to 5.20/scsi-queue, thanks!

[1/2] scsi: zfcp: declare zfcp_sdev_attrs as static

      https://git.kernel.org/mkp/scsi/c/b9787bdfdba5
[2/2] scsi: zfcp: drop unexpected word "the" in the comments
      https://git.kernel.org/mkp/scsi/c/9821106213c8
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering