Merge tag 'dma-mapping-5.20-2022-08-06' of git://git.infradead.org/users/hch/dma...

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index fdb81f2..db1b4b2 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -248,15 +248,6 @@ config BLK_DEV_NBD
 
          If unsure, say N.
 
-config BLK_DEV_SX8
-       tristate "Promise SATA SX8 support"
-       depends on PCI
-       help
-         Saying Y or M here will enable support for the 
-         Promise SATA SX8 controllers.
-
-         Use devices /dev/sx8/$N and /dev/sx8/$Np$M.
-
 config BLK_DEV_RAM
        tristate "RAM block device support"
        help
@@ -408,6 +399,15 @@ config BLK_DEV_RBD
 
          If unsure, say N.
 
+config BLK_DEV_UBLK
+       tristate "Userspace block driver (Experimental)"
+       select IO_URING
+       help
+         io_uring based userspace block driver. Together with ublk server, ublk
+         has been working well, but interface with userspace or command data
+         definition isn't finalized yet, and might change according to future
+         requirement, so mark is as experimental now.
+
 source "drivers/block/rnbd/Kconfig"
 
 endif # BLK_DEV