[PATCH 0/2] zfcp changes for v5.20

[PATCH 0/2] zfcp changes for v5.20

[Benjamin Block]

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(-)

-- 
2.36.1

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

[Benjamin Block]

From: Julian Wiedmann <jwi@linux.ibm.com>

These attributes are now only accessed through the
zfcp_sysfs_sdev_attr_group.

Fixes: d8d7cf3f7d07 ("scsi: zfcp: Switch to attribute groups")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
---
 drivers/s390/scsi/zfcp_sysfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index dbf3e50444e6..cb67fa80fb12 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -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,
-- 
2.36.1

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

[Benjamin Block]

From: Jiang Jian <jiangjian@cdjrlc.com>

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.

Signed-off-by: Jiang Jian <jiangjian@cdjrlc.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Link: https://lore.kernel.org/r/20220621114207.106405-1-jiangjian@cdjrlc.com
---
 drivers/s390/scsi/zfcp_diag.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/s390/scsi/zfcp_diag.h b/drivers/s390/scsi/zfcp_diag.h
index da55133da8fe..15c25fefe91a 100644
--- a/drivers/s390/scsi/zfcp_diag.h
+++ b/drivers/s390/scsi/zfcp_diag.h
@@ -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
  */
-- 
2.36.1

Re: [PATCH 0/2] zfcp changes for v5.20

[Martin K. Petersen]

Benjamin,

> 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!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 0/2] zfcp changes for v5.20

[Benjamin Block]

On Thu, Jul 07, 2022 at 05:34:11PM -0400, Martin K. Petersen wrote:
> 
> Benjamin,
> 
> > 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.

-- 
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

Re: [PATCH 0/2] zfcp changes for v5.20

[Martin K. Petersen]

On Wed, 6 Jul 2022 17:59:38 +0200, Benjamin Block wrote:

> 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

-- 
Martin K. Petersen	Oracle Linux Engineering