drop libnvdimm from 4.9 queue that broke the build

diff --git a/queue-4.9/libnvdimm-dax-fix-1gb-aligned-namespaces-vs-physical-misalignment.patch b/queue-4.9/libnvdimm-dax-fix-1gb-aligned-namespaces-vs-physical-misalignment.patch
deleted file mode 100644 (file)
index 6378232..0000000
--- a/queue-4.9/libnvdimm-dax-fix-1gb-aligned-namespaces-vs-physical-misalignment.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 41fce90f26333c4fa82e8e43b9ace86c4e8a0120 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dan.j.williams@intel.com>
-Date: Mon, 4 Dec 2017 14:07:43 -0800
-Subject: libnvdimm, dax: fix 1GB-aligned namespaces vs physical misalignment
-
-From: Dan Williams <dan.j.williams@intel.com>
-
-commit 41fce90f26333c4fa82e8e43b9ace86c4e8a0120 upstream.
-
-The following namespace configuration attempt:
-
-    # ndctl create-namespace -e namespace0.0 -m devdax -a 1G -f
-    libndctl: ndctl_dax_enable: dax0.1: failed to enable
-      Error: namespace0.0: failed to enable
-
-    failed to reconfigure namespace: No such device or address
-
-...fails when the backing memory range is not physically aligned to 1G:
-
-    # cat /proc/iomem | grep Persistent
-    210000000-30fffffff : Persistent Memory (legacy)
-
-In the above example the 4G persistent memory range starts and ends on a
-256MB boundary.
-
-We handle this case correctly when needing to handle cases that violate
-section alignment (128MB) collisions against "System RAM", and we simply
-need to extend that padding/truncation for the 1GB alignment use case.
-
-Fixes: 315c562536c4 ("libnvdimm, pfn: add 'align' attribute...")
-Reported-and-tested-by: Jane Chu <jane.chu@oracle.com>
-Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/nvdimm/pfn_devs.c |   15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
---- a/drivers/nvdimm/pfn_devs.c
-+++ b/drivers/nvdimm/pfn_devs.c
-@@ -562,6 +562,12 @@ static struct vmem_altmap *__nvdimm_setu
-       return altmap;
- }
- 
-+static u64 phys_pmem_align_down(struct nd_pfn *nd_pfn, u64 phys)
-+{
-+      return min_t(u64, PHYS_SECTION_ALIGN_DOWN(phys),
-+                      ALIGN_DOWN(phys, nd_pfn->align));
-+}
-+
- static int nd_pfn_init(struct nd_pfn *nd_pfn)
- {
-       u32 dax_label_reserve = is_nd_dax(&nd_pfn->dev) ? SZ_128K : 0;
-@@ -617,13 +623,16 @@ static int nd_pfn_init(struct nd_pfn *nd
-       start = nsio->res.start;
-       size = PHYS_SECTION_ALIGN_UP(start + size) - start;
-       if (region_intersects(start, size, IORESOURCE_SYSTEM_RAM,
--                              IORES_DESC_NONE) == REGION_MIXED) {
-+                              IORES_DESC_NONE) == REGION_MIXED
-+                      || !IS_ALIGNED(start + resource_size(&nsio->res),
-+                              nd_pfn->align)) {
-               size = resource_size(&nsio->res);
--              end_trunc = start + size - PHYS_SECTION_ALIGN_DOWN(start + size);
-+              end_trunc = start + size - phys_pmem_align_down(nd_pfn,
-+                              start + size);
-       }
- 
-       if (start_pad + end_trunc)
--              dev_info(&nd_pfn->dev, "%s section collision, truncate %d bytes\n",
-+              dev_info(&nd_pfn->dev, "%s alignment collision, truncate %d bytes\n",
-                               dev_name(&ndns->dev), start_pad + end_trunc);
- 
-       /*

diff --git a/queue-4.9/series b/queue-4.9/series
index 0b0d772ae123cd4ab693a91b50b1f543d6b64119..583f46282f6232bb95f867a52ae0bbc236186db1 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -15,7 +15,6 @@ kvm-x86-fix-load-rflags-w-o-the-fixed-bit.patch
 kvm-x86-fix-rsm-when-pcid-is-non-zero.patch
 clk-sunxi-sun9i-mmc-implement-reset-callback-for-reset-controls.patch
 powerpc-perf-dereference-bhrb-entries-safely.patch
-libnvdimm-dax-fix-1gb-aligned-namespaces-vs-physical-misalignment.patch
 libnvdimm-pfn-fix-start_pad-handling-for-aligned-namespaces.patch
 net-mvneta-clear-interface-link-status-on-port-disable.patch
 net-mvneta-use-proper-rxq_number-in-loop-on-rx-queues.patch