diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
| commit | 87314fb181f9042a226d721ab4a5579ddfca139c (patch) | |
| tree | b663e58cfe19ecf5003d4ea6e8048f6ae1925e9f /drivers/dax | |
| parent | 2002d2951398317d0f46e64ae6d8dd58ed541c6d (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
| download | linux-87314fb181f9042a226d721ab4a5579ddfca139c.tar.bz2 | |
Merge tag 'v5.10-rc6' into x86/cache
Merge -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig index 567428e10b7b..d2834c2cfa10 100644 --- a/drivers/dax/Kconfig +++ b/drivers/dax/Kconfig @@ -50,7 +50,6 @@ config DEV_DAX_HMEM Say M if unsure. config DEV_DAX_HMEM_DEVICES - depends on NUMA_KEEP_MEMINFO # for phys_to_target_node() depends on DEV_DAX_HMEM && DAX=y def_bool y |