vserver 2.0 rc7

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

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index a86569d..ac43f98 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -93,7 +93,7 @@ config MD_RAID10
          mirroring (RAID-1) with easier configuration and more flexable
          layout.
          Unlike RAID-0, but like RAID-1, RAID-10 requires all devices to
-         be the same size (or atleast, only as much as the smallest device
+         be the same size (or at least, only as much as the smallest device
          will be used).
          RAID-10 provides a variety of layouts that provide different levels
          of redundancy and performance.
@@ -102,6 +102,7 @@ config MD_RAID10
 
          ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/
 
+         If unsure, say Y.
 
 config MD_RAID5
        tristate "RAID-4/RAID-5 mode"
@@ -120,20 +121,16 @@ config MD_RAID5
          <http://www.tldp.org/docs.html#howto>. There you will also
          learn where to get the supporting user space utilities raidtools.
 
-         If you want to use such a RAID-4/RAID-5 set, say Y.  To compile
-         this code as a module, choose M here: the module will be called raid5.
+         If you want to use such a RAID-4/RAID-5 set, say Y.  To
+         compile this code as a module, choose M here: the module
+         will be called raid5.
 
          If unsure, say Y.
 
 config MD_RAID6
-       tristate "RAID-6 mode (EXPERIMENTAL)"
-       depends on BLK_DEV_MD && EXPERIMENTAL
+       tristate "RAID-6 mode"
+       depends on BLK_DEV_MD
        ---help---
-         WARNING: RAID-6 is currently highly experimental.  If you
-         use it, there is no guarantee whatsoever that it won't
-         destroy your data, eat your disk drives, insult your mother,
-         or re-appoint George W. Bush.
-
          A RAID-6 set of N drives with a capacity of C MB per drive
          provides the capacity of C * (N - 2) MB, and protects
          against a failure of any two drives. For a given sector
@@ -150,7 +147,7 @@ config MD_RAID6
          this code as a module, choose M here: the module will be
          called raid6.
 
-         If unsure, say N.
+         If unsure, say Y.
 
 config MD_MULTIPATH
        tristate "Multipath I/O support"
@@ -227,5 +224,17 @@ config DM_ZERO
          A target that discards writes, and returns all zeroes for
          reads.  Useful in some recovery situations.
 
+config DM_MULTIPATH
+       tristate "Multipath target (EXPERIMENTAL)"
+       depends on BLK_DEV_DM && EXPERIMENTAL
+       ---help---
+         Allow volume managers to support multipath hardware.
+
+config DM_MULTIPATH_EMC
+       tristate "EMC CX/AX multipath support (EXPERIMENTAL)"
+       depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+       ---help---
+         Multipath support for EMC CX/AX series hardware.
+
 endmenu