linux-next: manual merge of the nvdimm tree with the v4l-dvb tree

From: Stephen Rothwell
Date: Fri Aug 28 2015 - 02:19:24 EST

Hi Dan,

Today's linux-next merge of the nvdimm tree got a conflict in:


between commit:

8025e5ddf9c1 ("[media] mm: Provide new get_vaddr_frames() helper")

from the v4l-dvb tree and commit:

033fbae988fc ("mm: ZONE_DEVICE for "device memory"")

from the nvdimm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc mm/Kconfig
index 0fb2e96653fe,a0cd086df16b..000000000000
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -649,5 -655,19 +649,22 @@@ config DEFERRED_STRUCT_PAGE_INI
processes running early in the lifetime of the systemm until kswapd
finishes the initialisation.

+ bool
+ config ZONE_DEVICE
+ bool "Device memory (pmem, etc...) hotplug support" if EXPERT
+ default !ZONE_DMA
+ depends on !ZONE_DMA
+ depends on MEMORY_HOTPLUG
+ depends on X86_64 #arch_add_memory() comprehends device memory
+ help
+ Device memory hotplug support allows for establishing pmem,
+ or other device driver discovered memory regions, in the
+ memmap. This allows pfn_to_page() lookups of otherwise
+ "device-physical" addresses which is needed for using a DAX
+ mapping in an O_DIRECT operation, among other things.
+ If FS_DAX is enabled, then say Y.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at