From 9c61b0e5027ebd15db88d22f1db1b340aeb82412 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 2 Jan 2017 14:32:36 -0800 Subject: kconfig: disable MULTIPATH by default, enabled by --multipath Signed-off-by: Robin H. Johnson --- arch/ppc/kernel-config | 4 ++-- arch/s390/kernel-config | 2 +- arch/sparc64/kernel-config | 4 ++-- arch/x86/kernel-config | 8 ++++---- arch/x86_64/kernel-config | 2 +- defaults/kernel-config | 8 ++++---- defaults/kernel-generic-config | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/ppc/kernel-config b/arch/ppc/kernel-config index c8b8e6a..06b81a6 100644 --- a/arch/ppc/kernel-config +++ b/arch/ppc/kernel-config @@ -807,8 +807,8 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_MULTIPATH_EMC is not set # CONFIG_DM_MULTIPATH_RDAC is not set # CONFIG_DM_DELAY is not set CONFIG_BLK_DEV_DM_BBR=m diff --git a/arch/s390/kernel-config b/arch/s390/kernel-config index cae82b8..afd0127 100644 --- a/arch/s390/kernel-config +++ b/arch/s390/kernel-config @@ -739,7 +739,7 @@ CONFIG_DM_MIRROR=m # CONFIG_DM_LOG_USERSPACE is not set # CONFIG_DM_RAID is not set CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH is not set # CONFIG_DM_MULTIPATH_QL is not set # CONFIG_DM_MULTIPATH_ST is not set # CONFIG_DM_DELAY is not set diff --git a/arch/sparc64/kernel-config b/arch/sparc64/kernel-config index 21ea9fb..fbc6809 100644 --- a/arch/sparc64/kernel-config +++ b/arch/sparc64/kernel-config @@ -802,8 +802,8 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_MULTIPATH_EMC is not set CONFIG_BLK_DEV_DM_BBR=m # diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config index a3076f9..a71a75b 100644 --- a/arch/x86/kernel-config +++ b/arch/x86/kernel-config @@ -1352,10 +1352,10 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_MULTIPATH_EMC is not set +# CONFIG_DM_MULTIPATH_RDAC is not set +# CONFIG_DM_MULTIPATH_HP is not set # CONFIG_DM_DELAY is not set CONFIG_DM_UEVENT=y CONFIG_BLK_DEV_DM_BBR=m diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config index 2f539a8..8d39327 100644 --- a/arch/x86_64/kernel-config +++ b/arch/x86_64/kernel-config @@ -1406,7 +1406,7 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m # CONFIG_DM_LOG_USERSPACE is not set CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH is not set # CONFIG_DM_MULTIPATH_QL is not set # CONFIG_DM_MULTIPATH_ST is not set # CONFIG_DM_DELAY is not set diff --git a/defaults/kernel-config b/defaults/kernel-config index 26ffbfd..aba35fd 100644 --- a/defaults/kernel-config +++ b/defaults/kernel-config @@ -1347,10 +1347,10 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_MULTIPATH_EMC is not set +# CONFIG_DM_MULTIPATH_RDAC is not set +# CONFIG_DM_MULTIPATH_HP is not set # CONFIG_DM_DELAY is not set CONFIG_DM_UEVENT=y CONFIG_BLK_DEV_DM_BBR=m diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config index aa4f11b..518733e 100644 --- a/defaults/kernel-generic-config +++ b/defaults/kernel-generic-config @@ -719,16 +719,16 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_DEBUG is not set CONFIG_DM_DELAY=m CONFIG_DM_MIRROR=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_HP=m -CONFIG_DM_MULTIPATH_RDAC=m +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_MULTIPATH_EMC is not set +# CONFIG_DM_MULTIPATH_HP is not set +# CONFIG_DM_MULTIPATH_RDAC is not set CONFIG_DM_SNAPSHOT=m CONFIG_DM_UEVENT=y CONFIG_DM_ZERO=m CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m +# CONFIG_DM_MULTIPATH_QL is not set +# CONFIG_DM_MULTIPATH_ST is not set # # Fusion MPT device support -- cgit v1.2.3-65-gdbad