[PATCH net 0/2] s390/net: updates 2020-05-13

Dave,

please apply the fix from Wei Yongjun to netdev's net tree and
add Karsten Graul as co-maintainer for drivers/s390/net.

Thanks, Ursula

Ursula Braun (1):
  MAINTAINERS: add Karsten Graul as S390 NETWORK DRIVERS maintainer

Wei Yongjun (1):
  s390/ism: fix error return code in ism_probe()

 MAINTAINERS                | 1 +
 drivers/s390/net/ism_drv.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

-- 
2.17.1

Add Karsten as additional maintainer for drivers/s390/net .
One of his focal points is the ism driver.

Cc: Julian Wiedmann <redacted>
Acked-by: Julian Wiedmann <redacted>
Signed-off-by: Ursula Braun <redacted>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 88bf36ab2b22..85894787825e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS

@@ -14644,6 +14644,7 @@ F:	drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
 M:	Julian Wiedmann <jwi@linux.ibm.com>
+M:	Karsten Graul <kgraul@linux.ibm.com>
 M:	Ursula Braun <ubraun@linux.ibm.com>
 L:	linux-s390@vger.kernel.org
 S:	Supported

-- 
2.17.1

From: Wei Yongjun <redacted>

Fix to return negative error code -ENOMEM from the smcd_alloc_dev()
error handling case instead of 0, as done elsewhere in this function.

Fixes: 684b89bc39ce ("s390/ism: add device driver for internal shared memory")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wei Yongjun <redacted>
Signed-off-by: Ursula Braun <redacted>
---
 drivers/s390/net/ism_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c
index c75112ee7b97..c7fade836d83 100644
--- a/drivers/s390/net/ism_drv.c
+++ b/drivers/s390/net/ism_drv.c

@@ -521,8 +521,10 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	ism->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops,
 				   ISM_NR_DMBS);
-	if (!ism->smcd)
+	if (!ism->smcd) {
+		ret = -ENOMEM;
 		goto err_resource;
+	}
 
 	ism->smcd->priv = ism;
 	ret = ism_dev_init(ism);

-- 
2.17.1

From: Ursula Braun <redacted>
Date: Wed, 13 May 2020 09:42:28 +0200

please apply the fix from Wei Yongjun to netdev's net tree and
add Karsten Graul as co-maintainer for drivers/s390/net.

Series applied, thanks.