Merge tag 'v4.5-rc6' into core/resources, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 8ebfcaae3f5a..9edf7eb7d17c 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -1277,10 +1277,12 @@ static ssize_t mode_show(struct device *dev,
 
         device_lock(dev);
         claim = ndns->claim;
-        if (pmem_should_map_pages(dev) || (claim && is_nd_pfn(claim)))
-                mode = "memory";
-        else if (claim && is_nd_btt(claim))
+        if (claim && is_nd_btt(claim))
                 mode = "safe";
+        else if (claim && is_nd_pfn(claim))
+                mode = "memory";
+        else if (!claim && pmem_should_map_pages(dev))
+                mode = "memory";
         else
                 mode = "raw";
         rc = sprintf(buf, "%s\n", mode);