drop broken nvdimm patch

diff --git a/queue-5.3/libnvdimm-prevent-nvdimm-from-requesting-key-when-security-is-disabled.patch b/queue-5.3/libnvdimm-prevent-nvdimm-from-requesting-key-when-security-is-disabled.patch
deleted file mode 100644 (file)
index 31c35de..0000000
--- a/queue-5.3/libnvdimm-prevent-nvdimm-from-requesting-key-when-security-is-disabled.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 674f31a352da5e9f621f757b9a89262f486533a0 Mon Sep 17 00:00:00 2001
-From: Dave Jiang <dave.jiang@intel.com>
-Date: Tue, 24 Sep 2019 10:34:49 -0700
-Subject: libnvdimm: prevent nvdimm from requesting key when security is disabled
-
-From: Dave Jiang <dave.jiang@intel.com>
-
-commit 674f31a352da5e9f621f757b9a89262f486533a0 upstream.
-
-Current implementation attempts to request keys from the keyring even when
-security is not enabled. Change behavior so when security is disabled it
-will skip key request.
-
-Error messages seen when no keys are installed and libnvdimm is loaded:
-
-    request-key[4598]: Cannot find command to construct key 661489677
-    request-key[4606]: Cannot find command to construct key 34713726
-
-Cc: stable@vger.kernel.org
-Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs")
-Signed-off-by: Dave Jiang <dave.jiang@intel.com>
-Link: https://lore.kernel.org/r/156934642272.30222.5230162488753445916.stgit@djiang5-desk3.ch.intel.com
-Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/nvdimm/security.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/nvdimm/security.c
-+++ b/drivers/nvdimm/security.c
-@@ -177,6 +177,10 @@ static int __nvdimm_security_unlock(stru
-                       || nvdimm->sec.state < 0)
-               return -EIO;
- 
-+      /* No need to go further if security is disabled */
-+      if (test_bit(NVDIMM_SECURITY_DISABLED, &nvdimm->sec.flags))
-+              return 0;
-+
-       if (test_bit(NDD_SECURITY_OVERWRITE, &nvdimm->flags)) {
-               dev_dbg(dev, "Security operation in progress.\n");
-               return -EBUSY;

diff --git a/queue-5.3/series b/queue-5.3/series
index 905e345c2d20ae15e43fea29e02fd23e1c831fe6..d2abaf8008bef4d56afa5fbcb8020dc98b2879e0 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -77,7 +77,6 @@ mmc-sdhci-of-esdhc-set-dma-snooping-based-on-dma-coherence.patch
 mmc-sdhci-let-drivers-define-their-dma-mask.patch
 revert-locking-pvqspinlock-don-t-wait-if-vcpu-is-preempted.patch
 libnvdimm-altmap-track-namespace-boundaries-in-altmap.patch
-libnvdimm-prevent-nvdimm-from-requesting-key-when-security-is-disabled.patch
 sched-add-__assembly__-guards-around-struct-clone_args.patch
 dts-arm-gta04-introduce-legacy-spi-cs-high-to-make-display-work-again.patch
 xen-balloon-set-pages-pageoffline-in-balloon_add_region.patch