Merge tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[karo-tx-linux.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 1de8372d9459a6a6ba08cfdcbd0955ce664767d7..349ff88134016661b09a119bf9fa57062b52846d 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -115,7 +115,7 @@ config MD_RAID10
 
          RAID-10 requires mdadm-1.7.0 or later, available at:
 
-         ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/
+         https://www.kernel.org/pub/linux/utils/raid/mdadm/
 
          If unsure, say Y.
 
@@ -326,14 +326,6 @@ config DM_CACHE_SMQ
          of less memory utilization, improved performance and increased
          adaptability in the face of changing workloads.
 
-config DM_CACHE_CLEANER
-       tristate "Cleaner Cache Policy (EXPERIMENTAL)"
-       depends on DM_CACHE
-       default y
-       ---help---
-         A simple cache policy that writes back all data to the
-         origin.  Used when decommissioning a dm-cache.
-
 config DM_ERA
        tristate "Era target (EXPERIMENTAL)"
        depends on BLK_DEV_DM
@@ -366,6 +358,7 @@ config DM_LOG_USERSPACE
 config DM_RAID
        tristate "RAID 1/4/5/6/10 target"
        depends on BLK_DEV_DM
+       select MD_RAID0
        select MD_RAID1
        select MD_RAID10
        select MD_RAID456
@@ -509,4 +502,14 @@ config DM_LOG_WRITES
 
          If unsure, say N.
 
+config DM_INTEGRITY
+       tristate "Integrity target"
+       depends on BLK_DEV_DM
+       select BLK_DEV_INTEGRITY
+       select DM_BUFIO
+       select CRYPTO
+       select ASYNC_XOR
+       ---help---
+          This is the integrity target.
+
 endif # MD