Disable Infiniband/RDMA on ARMv7 as we no longer have userspace tools

48 files changed, 173 insertions, 138 deletions

diff --git a/baseconfig/arm/armv7/CONFIG_CGROUP_RDMA b/baseconfig/arm/armv7/CONFIG_CGROUP_RDMA
new file mode 100644
index 000000000..94ae4f4bc
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_CGROUP_RDMA
@@ -0,0 +1 @@
+# CONFIG_CGROUP_RDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND b/baseconfig/arm/armv7/CONFIG_INFINIBAND
new file mode 100644
index 000000000..b475048ed
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB3 b/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB3
new file mode 100644
index 000000000..f06c87360
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB3
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_CXGB3 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB4 b/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB4
new file mode 100644
index 000000000..40ff06894
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB4
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_CXGB4 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_I40IW b/baseconfig/arm/armv7/CONFIG_INFINIBAND_I40IW
new file mode 100644
index 000000000..39998dbd7
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_I40IW
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_I40IW is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB
new file mode 100644
index 000000000..5f27e681e
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_IPOIB is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM
new file mode 100644
index 000000000..b26396a7e
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_IPOIB_CM is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG
new file mode 100644
index 000000000..f1a19d66a
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
new file mode 100644
index 000000000..00e419c17
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISER b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISER
new file mode 100644
index 000000000..89d63b0a5
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISER
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_ISER is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISERT b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISERT
new file mode 100644
index 000000000..a8c9bda68
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISERT
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_ISERT is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_MTHCA b/baseconfig/arm/armv7/CONFIG_INFINIBAND_MTHCA
new file mode 100644
index 000000000..a134e36a3
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_MTHCA
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_MTHCA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_NES b/baseconfig/arm/armv7/CONFIG_INFINIBAND_NES
new file mode 100644
index 000000000..eee505590
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_NES
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_NES is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_OCRDMA b/baseconfig/arm/armv7/CONFIG_INFINIBAND_OCRDMA
new file mode 100644
index 000000000..12ff35161
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_OCRDMA
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_OCRDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING
new file mode 100644
index 000000000..80be02a8b
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB b/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB
new file mode 100644
index 000000000..591f4e962
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_QIB is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB_DCA b/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB_DCA
new file mode 100644
index 000000000..810520ecc
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB_DCA
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_QIB_DCA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_RDMAVT b/baseconfig/arm/armv7/CONFIG_INFINIBAND_RDMAVT
new file mode 100644
index 000000000..b32d29489
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_RDMAVT
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_RDMAVT is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRP b/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRP
new file mode 100644
index 000000000..27e9c13e6
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRP
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_SRP is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRPT b/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRPT
new file mode 100644
index 000000000..ad99ea1ea
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRPT
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_SRPT is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS
new file mode 100644
index 000000000..e59e563c4
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_USER_ACCESS is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_MAD b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_MAD
new file mode 100644
index 000000000..2dd5ad05d
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_MAD
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_USER_MAD is not set
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USNIC b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USNIC
new file mode 100644
index 000000000..3624c0fd6
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_INFINIBAND_USNIC
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_USNIC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MLX4_INFINIBAND b/baseconfig/arm/armv7/CONFIG_MLX4_INFINIBAND
new file mode 100644
index 000000000..84f627ee6
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MLX4_INFINIBAND
@@ -0,0 +1 @@
+# CONFIG_MLX4_INFINIBAND is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MLX5_INFINIBAND b/baseconfig/arm/armv7/CONFIG_MLX5_INFINIBAND
new file mode 100644
index 000000000..c09ba1a61
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MLX5_INFINIBAND
@@ -0,0 +1 @@
+# CONFIG_MLX5_INFINIBAND is not set
diff --git a/baseconfig/arm/armv7/CONFIG_NET_9P_RDMA b/baseconfig/arm/armv7/CONFIG_NET_9P_RDMA
new file mode 100644
index 000000000..fce5acb9a
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_NET_9P_RDMA
@@ -0,0 +1 @@
+# CONFIG_NET_9P_RDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_NVME_RDMA b/baseconfig/arm/armv7/CONFIG_NVME_RDMA
new file mode 100644
index 000000000..5815bee55
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_NVME_RDMA
@@ -0,0 +1 @@
+# CONFIG_NVME_RDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_NVME_TARGET_RDMA b/baseconfig/arm/armv7/CONFIG_NVME_TARGET_RDMA
new file mode 100644
index 000000000..e57c5b285
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_NVME_TARGET_RDMA
@@ -0,0 +1 @@
+# CONFIG_NVME_TARGET_RDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_RDMA_RXE b/baseconfig/arm/armv7/CONFIG_RDMA_RXE
new file mode 100644
index 000000000..66d4cbe32
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_RDMA_RXE
@@ -0,0 +1 @@
+# CONFIG_RDMA_RXE is not set
diff --git a/baseconfig/arm/armv7/CONFIG_RDS_RDMA b/baseconfig/arm/armv7/CONFIG_RDS_RDMA
new file mode 100644
index 000000000..169ffb921
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_RDS_RDMA
@@ -0,0 +1 @@
+# CONFIG_RDS_RDMA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SECURITY_INFINIBAND b/baseconfig/arm/armv7/CONFIG_SECURITY_INFINIBAND
new file mode 100644
index 000000000..8bcc67164
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SECURITY_INFINIBAND
@@ -0,0 +1 @@
+# CONFIG_SECURITY_INFINIBAND is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA b/baseconfig/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA
new file mode 100644
index 000000000..f0616cc93
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA
@@ -0,0 +1 @@
+# CONFIG_SUNRPC_XPRT_RDMA is not set
diff --git a/baseconfig/CONFIG_INFINIBAND_VMWARE_PVRDMA b/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
index 164f3b26c..164f3b26c 100644
--- a/baseconfig/CONFIG_INFINIBAND_VMWARE_PVRDMA
+++ b/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 358e0274f..9cc528648 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2185,7 +2185,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7ddff1919..151f383ed 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2168,7 +2168,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 925fd0f15..e83a8732a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2306,31 +2306,31 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_CXGB3 is not set
+# CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_I40IW is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB is not set
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFINIBAND_MTHCA is not set
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_NES=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+# CONFIG_INFINIBAND_NES is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
+# CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set
 # CONFIG_INFINIBAND_QEDR is not set
-CONFIG_INFINIBAND_QIB_DCA=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_QIB_DCA is not set
+# CONFIG_INFINIBAND_QIB is not set
+# CONFIG_INFINIBAND_RDMAVT is not set
+# CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
+# CONFIG_INFINIBAND_USER_ACCESS is not set
+# CONFIG_INFINIBAND_USER_MAD is not set
+# CONFIG_INFINIBAND_USNIC is not set
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
@@ -3264,14 +3264,14 @@ CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
-CONFIG_MLX4_INFINIBAND=m
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_EN_IPSEC is not set
 # CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_INFINIBAND=m
+# CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_MLXFW=m
@@ -3557,7 +3557,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P=m
-CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_RDMA is not set
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
 CONFIG_NET_ACT_BPF=m
@@ -4062,12 +4062,12 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_NVME_RDMA=m
+# CONFIG_NVME_RDMA is not set
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_RDMA is not set
 # CONFIG_NVM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -4625,10 +4625,10 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_RXE is not set
 # CONFIG_RDS_DEBUG is not set
 # CONFIG_RDS is not set
-CONFIG_RDS_RDMA=m
+# CONFIG_RDS_RDMA is not set
 CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
@@ -5089,7 +5089,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
-CONFIG_SECURITY_INFINIBAND=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -5953,7 +5953,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_XPRT_RDMA is not set
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNXI_RSB=m
 CONFIG_SUNXI_SRAM=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 7a2b1481f..af3e2a1da 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2186,31 +2186,31 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_CXGB3 is not set
+# CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_I40IW is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB is not set
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFINIBAND_MTHCA is not set
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_NES=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+# CONFIG_INFINIBAND_NES is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
+# CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set
 # CONFIG_INFINIBAND_QEDR is not set
-CONFIG_INFINIBAND_QIB_DCA=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_QIB_DCA is not set
+# CONFIG_INFINIBAND_QIB is not set
+# CONFIG_INFINIBAND_RDMAVT is not set
+# CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
+# CONFIG_INFINIBAND_USER_ACCESS is not set
+# CONFIG_INFINIBAND_USER_MAD is not set
+# CONFIG_INFINIBAND_USNIC is not set
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
@@ -3118,14 +3118,14 @@ CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
-CONFIG_MLX4_INFINIBAND=m
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_EN_IPSEC is not set
 # CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_INFINIBAND=m
+# CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_MLXFW=m
@@ -3386,7 +3386,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P=m
-CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_RDMA is not set
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
 CONFIG_NET_ACT_BPF=m
@@ -3885,12 +3885,12 @@ CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_NVME_RDMA=m
+# CONFIG_NVME_RDMA is not set
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_RDMA is not set
 # CONFIG_NVM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -4352,10 +4352,10 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_RXE is not set
 # CONFIG_RDS_DEBUG is not set
 # CONFIG_RDS is not set
-CONFIG_RDS_RDMA=m
+# CONFIG_RDS_RDMA is not set
 CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
@@ -4787,7 +4787,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
-CONFIG_SECURITY_INFINIBAND=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -5556,7 +5556,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_XPRT_RDMA is not set
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNXI_RSB=m
 CONFIG_SUNXI_SRAM=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b323fd88a..984e00189 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2169,31 +2169,31 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_CXGB3 is not set
+# CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_I40IW is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB is not set
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFINIBAND_MTHCA is not set
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_NES=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+# CONFIG_INFINIBAND_NES is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
+# CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set
 # CONFIG_INFINIBAND_QEDR is not set
-CONFIG_INFINIBAND_QIB_DCA=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_QIB_DCA is not set
+# CONFIG_INFINIBAND_QIB is not set
+# CONFIG_INFINIBAND_RDMAVT is not set
+# CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
+# CONFIG_INFINIBAND_USER_ACCESS is not set
+# CONFIG_INFINIBAND_USER_MAD is not set
+# CONFIG_INFINIBAND_USNIC is not set
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
@@ -3098,14 +3098,14 @@ CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
-CONFIG_MLX4_INFINIBAND=m
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_EN_IPSEC is not set
 # CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_INFINIBAND=m
+# CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_MLXFW=m
@@ -3365,7 +3365,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P=m
-CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_RDMA is not set
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
 CONFIG_NET_ACT_BPF=m
@@ -3864,12 +3864,12 @@ CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_NVME_RDMA=m
+# CONFIG_NVME_RDMA is not set
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_RDMA is not set
 # CONFIG_NVM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -4330,10 +4330,10 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_RXE is not set
 # CONFIG_RDS_DEBUG is not set
 # CONFIG_RDS is not set
-CONFIG_RDS_RDMA=m
+# CONFIG_RDS_RDMA is not set
 CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
@@ -4765,7 +4765,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
-CONFIG_SECURITY_INFINIBAND=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -5533,7 +5533,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_XPRT_RDMA is not set
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNXI_RSB=m
 CONFIG_SUNXI_SRAM=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 8a5dace29..73ff3c694 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2289,31 +2289,31 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_CXGB3 is not set
+# CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_I40IW is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB is not set
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFINIBAND_MTHCA is not set
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_NES=m
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+# CONFIG_INFINIBAND_NES is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
+# CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set
 # CONFIG_INFINIBAND_QEDR is not set
-CONFIG_INFINIBAND_QIB_DCA=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_QIB_DCA is not set
+# CONFIG_INFINIBAND_QIB is not set
+# CONFIG_INFINIBAND_RDMAVT is not set
+# CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
+# CONFIG_INFINIBAND_USER_ACCESS is not set
+# CONFIG_INFINIBAND_USER_MAD is not set
+# CONFIG_INFINIBAND_USNIC is not set
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
@@ -3244,14 +3244,14 @@ CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
-CONFIG_MLX4_INFINIBAND=m
+# CONFIG_MLX4_INFINIBAND is not set
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_EN_IPSEC is not set
 # CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_INFINIBAND=m
+# CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_MLXFW=m
@@ -3536,7 +3536,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P=m
-CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_RDMA is not set
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
 CONFIG_NET_ACT_BPF=m
@@ -4041,12 +4041,12 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_NVME_RDMA=m
+# CONFIG_NVME_RDMA is not set
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_RDMA is not set
 # CONFIG_NVM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -4603,10 +4603,10 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_RXE is not set
 # CONFIG_RDS_DEBUG is not set
 # CONFIG_RDS is not set
-CONFIG_RDS_RDMA=m
+# CONFIG_RDS_RDMA is not set
 CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
@@ -5067,7 +5067,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
-CONFIG_SECURITY_INFINIBAND=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -5930,7 +5930,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_XPRT_RDMA is not set
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNXI_RSB=m
 CONFIG_SUNXI_SRAM=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index c17813d6b..3f5b1379e 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1970,7 +1970,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d368edd1f..915cdedf9 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1952,7 +1952,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c76b90fb2..c370527a6 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1916,7 +1916,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index de68e7c9d..7fce767f1 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1898,7 +1898,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 0ae90d5fe..1c0c9440c 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1915,7 +1915,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 0c2a27ff0..02ca43cfc 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1897,7 +1897,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 25977b5f7..78b40ced0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1864,7 +1864,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7f0886fc8..2b85deb10 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1846,7 +1846,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
diff --git a/kernel.spec b/kernel.spec
index 430cac109..01063f7aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2210,6 +2210,9 @@ fi
 #
 #
 %changelog
+* Thu Aug 31 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable Infiniband/RDMA on ARMv7 as we no longer have userspace tools
+
 * Thu Aug 31 2017 Laura Abbott <labbott@redhat.com> - 4.13.0-0.rc7.git3.1
 - Linux v4.13-rc7-37-g42ff72cf2702