summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_MLX5_EN_IPSEC2
-rw-r--r--baseconfig/CONFIG_MLX5_FPGA2
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config4
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config4
-rw-r--r--kernel-armv7hl-lpae.config4
-rw-r--r--kernel-armv7hl.config4
-rw-r--r--kernel-i686-PAE.config4
-rw-r--r--kernel-i686-PAEdebug.config4
-rw-r--r--kernel-i686-debug.config4
-rw-r--r--kernel-i686.config4
-rw-r--r--kernel-ppc64-debug.config4
-rw-r--r--kernel-ppc64.config4
-rw-r--r--kernel-ppc64le-debug.config4
-rw-r--r--kernel-ppc64le.config4
-rw-r--r--kernel-ppc64p7-debug.config4
-rw-r--r--kernel-ppc64p7.config4
-rw-r--r--kernel-s390x-debug.config4
-rw-r--r--kernel-s390x.config4
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config4
22 files changed, 42 insertions, 42 deletions
diff --git a/baseconfig/CONFIG_MLX5_EN_IPSEC b/baseconfig/CONFIG_MLX5_EN_IPSEC
index 99e6ad7ff..ba2658e5a 100644
--- a/baseconfig/CONFIG_MLX5_EN_IPSEC
+++ b/baseconfig/CONFIG_MLX5_EN_IPSEC
@@ -1 +1 @@
-CONFIG_MLX5_EN_IPSEC=y
+# CONFIG_MLX5_EN_IPSEC is not set
diff --git a/baseconfig/CONFIG_MLX5_FPGA b/baseconfig/CONFIG_MLX5_FPGA
index bac6b305d..544f7b4f6 100644
--- a/baseconfig/CONFIG_MLX5_FPGA
+++ b/baseconfig/CONFIG_MLX5_FPGA
@@ -1 +1 @@
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_FPGA is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index edcb854c2..1d876860b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3048,8 +3048,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 287ce9754..50ebb2c1c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3028,8 +3028,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index dee6021b9..4394ceb85 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3251,8 +3251,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 741fbcd50..c19ddc477 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3105,8 +3105,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 78b0570df..df0a80756 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3085,8 +3085,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1b8b95de4..596ee4253 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3231,8 +3231,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 65c4a3516..b43688eeb 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2949,8 +2949,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 154cad97f..87a01ebd8 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2969,8 +2969,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 17c8942b9..3a2e454bf 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2969,8 +2969,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 2a842c4f4..ef1ad2379 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2949,8 +2949,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 68b29b93c..491adc46b 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2811,8 +2811,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 71afd59a9..f1525818f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2790,8 +2790,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 1b2f37fe8..2cdc44ae2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2757,8 +2757,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index b9e74a6b6..52491ca8f 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2736,8 +2736,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 5e0e1b601..2fdebcd1d 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2756,8 +2756,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 435c2d948..0557fae5f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2735,8 +2735,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e56708bae..360934415 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2694,8 +2694,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 48c409fc5..638b26f30 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2673,8 +2673,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 470f626e8..42052864e 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3011,8 +3011,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 10c4c2af9..3c22c15c9 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2991,8 +2991,8 @@ CONFIG_MLX5_CORE_EN_DCB=y
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_IPOIB=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_EN_IPSEC=y
-CONFIG_MLX5_FPGA=y
+# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m