[folded-merged] device-dax-make-pgmap-optional-for-instance-creation-fix.patch removed from -mm tree

[folded-merged] device-dax-make-pgmap-optional-for-instance-creation-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: device-dax-make-pgmap-optional-for-instance-creation-fix
has been removed from the -mm tree.  Its filename was
     device-dax-make-pgmap-optional-for-instance-creation-fix.patch

This patch was dropped because it was folded into device-dax-make-pgmap-optional-for-instance-creation.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: device-dax-make-pgmap-optional-for-instance-creation-fix

MEMORY_DEVICE_DEVDAX was renamed to MEMORY_DEVICE_GENERIC

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/dax/device.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/dax/device.c~device-dax-make-pgmap-optional-for-instance-creation-fix
+++ a/drivers/dax/device.c
@@ -419,7 +419,7 @@ int dev_dax_probe(struct device *dev)
 		pgmap->res.start = range->start;
 		pgmap->res.end = range->end;
 	}
-	pgmap->type = MEMORY_DEVICE_DEVDAX;
+	pgmap->type = MEMORY_DEVICE_GENERIC;
 	addr = devm_memremap_pages(dev, pgmap);
 	if (IS_ERR(addr))
 		return PTR_ERR(addr);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-memory_hotplug-introduce-default-phys_to_target_node-implementation-fix.patch
powerpc-mm-move-setting-pte-specific-flags-to-pfn_pte-fix.patch
mm-gup-dont-permit-users-to-call-get_user_pages-with-foll_longterm-fix.patch
mm-page_allocc-clean-code-by-removing-unnecessary-initialization-fix.patch
mm-mempool-add-else-to-split-mutually-exclusive-case-fix.patch
memblock-make-memblock_debug-and-related-functionality-private-fix.patch
arch-drivers-replace-for_each_membock-with-for_each_mem_range-fix.patch
xarray-add-xa_get_order-fix.patch
xarray-add-xas_split-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-memory_hotplug-simplify-page-offlining-fix.patch
checkpatch-warn-on-self-assignments-checkpatch-fixes.patch
fs-binfmt_elf-use-pt_load-p_align-values-for-suitable-start-address-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix-fix-fix-fix-fix-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch