Merge branch 's390-fixes' (f3fbc5a3) · Commits · 戴 / test

Ursula Braun says: ==================== s390/net: updates 2020-05-13 please apply the fix from Wei Yongjun to netdev's net tree and add Karsten Graul as co-maintainer for drivers/s390/net. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

drivers/s390/net/ism_drv.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message