Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 0602e82..f45fb37 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -15,6 +15,7 @@ if MD
 
 config BLK_DEV_MD
        tristate "RAID support"
 
 config BLK_DEV_MD
        tristate "RAID support"

+       select BLOCK_HOLDER_DEPRECATED if SYSFS

        help
          This driver lets you combine several hard disk partitions into one
          logical block device. This can be used to simply append one
        help
          This driver lets you combine several hard disk partitions into one
          logical block device. This can be used to simply append one


@@ -201,6 +202,7 @@ config BLK_DEV_DM_BUILTIN
 
 config BLK_DEV_DM
        tristate "Device mapper support"
 
 config BLK_DEV_DM
        tristate "Device mapper support"

+       select BLOCK_HOLDER_DEPRECATED if SYSFS

        select BLK_DEV_DM_BUILTIN
        depends on DAX || DAX=n
        help
        select BLK_DEV_DM_BUILTIN
        depends on DAX || DAX=n
        help


@@ -340,7 +342,7 @@ config DM_WRITECACHE
 
 config DM_EBS
        tristate "Emulated block size target (EXPERIMENTAL)"
 
 config DM_EBS
        tristate "Emulated block size target (EXPERIMENTAL)"

-       depends on BLK_DEV_DM
+       depends on BLK_DEV_DM && !HIGHMEM

        select DM_BUFIO
        help
          dm-ebs emulates smaller logical block size on backing devices
        select DM_BUFIO
        help
          dm-ebs emulates smaller logical block size on backing devices