Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-12-04 16:42:05 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-12-04 16:42:51 +0100
commit13326cf5ae34a606e26c63131725c474b4d74637 (patch)
tree695c31102c0edf666f0323c72a93feb51b797345
parentd6b8967cb551ac8c9add598baf6960dbae90a082 (diff)
Refresh patches.drivers/net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch.
-rw-r--r--patches.drivers/net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch (renamed from patches.drivers/net-net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch)18
-rw-r--r--series.conf4
2 files changed, 14 insertions, 8 deletions
diff --git a/patches.drivers/net-net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch b/patches.drivers/net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch
index 971f28ec48..38697eb0a0 100644
--- a/patches.drivers/net-net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch
+++ b/patches.drivers/net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch
@@ -1,11 +1,12 @@
-From patchwork Fri Nov 30 16:59:08 2018
-Subject: [net] net/ibmvnic: Fix RTNL deadlock during device reset
-X-Patchwork-Id: 1006087
-Date: Fri, 30 Nov 2018 10:59:08 -0600
+From 986103e7920cabc0b910749e77ae5589d3934d52 Mon Sep 17 00:00:00 2001
From: Thomas Falcon <tlfalcon@linux.ibm.com>
+Date: Fri, 30 Nov 2018 10:59:08 -0600
+Subject: [PATCH] net/ibmvnic: Fix RTNL deadlock during device reset
References: bnc#1115431
-Patch-mainline: submitted, http://patchwork.ozlabs.org/patch/1006087/
+Patch-mainline: queued
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: 986103e7920cabc0b910749e77ae5589d3934d52
Commit a5681e20b541 ("net/ibmnvic: Fix deadlock problem
in reset") made the change to hold the RTNL lock during
@@ -15,15 +16,15 @@ which is functionally the same except that it does not
take the RTNL lock again.
Fixes: a5681e20b541 ("net/ibmnvic: Fix deadlock problem in reset")
-
Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
-index c0203a0..ed50b8d 100644
+index c0203a0d5e3b..ed50b8dee44f 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1859,7 +1859,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,
@@ -35,3 +36,6 @@ index c0203a0..ed50b8d 100644
netif_carrier_on(netdev);
+--
+2.19.2
+
diff --git a/series.conf b/series.conf
index 0ddd4aa56e..f98d2cb9bc 100644
--- a/series.conf
+++ b/series.conf
@@ -19036,6 +19036,9 @@
patches.fixes/nvme-free-ctrl-device-name-on-init-failure.patch
patches.fixes/0001-xen-x86-add-diagnostic-printout-to-xen_mc_flush-in-c.patch
+ # davem/net
+ patches.drivers/net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch
+
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
patches.suse/0002-efi-Add-EFI-signature-data-types.patch
@@ -19079,7 +19082,6 @@
patches.suse/tty-ldsem-Convert-to-regular-lockdep-annotations.patch
patches.suse/tty-ldsem-Add-lockdep-asserts-for-ldisc_sem.patch
patches.suse/tty-ldsem-Decrement-wait_readers-on-timeouted-down_r.patch
- patches.drivers/net-net-ibmvnic-Fix-RTNL-deadlock-during-device-reset.patch
########################################################
# end of sorted patches