Enable a few infiniband options (rhbz 1291902)

25 files changed, 65 insertions, 41 deletions

diff --git a/configs/fedora/generic/CONFIG_INFINIBAND_QEDR b/configs/fedora/generic/CONFIG_INFINIBAND_QEDR
index 5fa3da394..657c87e5c 100644
--- a/configs/fedora/generic/CONFIG_INFINIBAND_QEDR
+++ b/configs/fedora/generic/CONFIG_INFINIBAND_QEDR
@@ -1 +1 @@
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
diff --git a/configs/fedora/generic/CONFIG_SMC b/configs/fedora/generic/CONFIG_SMC
index 88600dc91..56a7452af 100644
--- a/configs/fedora/generic/CONFIG_SMC
+++ b/configs/fedora/generic/CONFIG_SMC
@@ -1 +1 @@
-# CONFIG_SMC is not set
+CONFIG_SMC=m
diff --git a/configs/fedora/generic/CONFIG_SMC_DIAG b/configs/fedora/generic/CONFIG_SMC_DIAG
new file mode 100644
index 000000000..728cb1e4f
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SMC_DIAG
@@ -0,0 +1 @@
+CONFIG_SMC_DIAG=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_INFINIBAND_BNXT_RE b/configs/fedora/generic/x86/x86_64/CONFIG_INFINIBAND_BNXT_RE
new file mode 100644
index 000000000..23a29a3f1
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_INFINIBAND_BNXT_RE
@@ -0,0 +1 @@
+CONFIG_INFINIBAND_BNXT_RE=m
diff --git a/filter-modules.sh b/filter-modules.sh
index 50585d5be..c7f6bc359 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -30,7 +30,7 @@ usbdrvs="atm image misc serial wusbcore"
 
 fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
 
-netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp wireless"
+netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
 
 drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
 
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3c3408ae2..e25cdb8c0 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2297,7 +2297,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -5247,7 +5247,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 1d5b269a7..062290dda 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2279,7 +2279,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -5224,7 +5224,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 324b19d14..84ee3e7ca 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2423,7 +2423,7 @@ CONFIG_INET=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_QEDR=m
 # CONFIG_INFINIBAND_QIB_DCA is not set
 # CONFIG_INFINIBAND_QIB is not set
 # CONFIG_INFINIBAND_RDMAVT is not set
@@ -5592,7 +5592,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP_ON_UP=y
 CONFIG_SMP=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6de303fbf..31525f06c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2301,7 +2301,7 @@ CONFIG_INET=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_QEDR=m
 # CONFIG_INFINIBAND_QIB_DCA is not set
 # CONFIG_INFINIBAND_QIB is not set
 # CONFIG_INFINIBAND_RDMAVT is not set
@@ -5269,7 +5269,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP_ON_UP=y
 CONFIG_SMP=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6a0ae601e..5b8cf7c51 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2283,7 +2283,7 @@ CONFIG_INET=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_QEDR=m
 # CONFIG_INFINIBAND_QIB_DCA is not set
 # CONFIG_INFINIBAND_QIB is not set
 # CONFIG_INFINIBAND_RDMAVT is not set
@@ -5246,7 +5246,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP_ON_UP=y
 CONFIG_SMP=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index dbbeb6038..958e145a4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2405,7 +2405,7 @@ CONFIG_INET=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_QEDR=m
 # CONFIG_INFINIBAND_QIB_DCA is not set
 # CONFIG_INFINIBAND_QIB is not set
 # CONFIG_INFINIBAND_RDMAVT is not set
@@ -5569,7 +5569,8 @@ CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP_ON_UP=y
 CONFIG_SMP=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 9a7b5f58c..8034b533c 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2125,7 +2125,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4908,7 +4908,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 3dc857c8d..f63457072 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2144,7 +2144,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4930,7 +4930,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 98dc32b91..9bacbf714 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2144,7 +2144,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4930,7 +4930,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index fc21a4e40..7f6abb026 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2125,7 +2125,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4908,7 +4908,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index f8b3fdaf2..b84bc930a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2033,7 +2033,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4731,7 +4731,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d6ed8259c..87b6c2424 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2014,7 +2014,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4707,7 +4707,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 747f57f36..7c85d1c40 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1978,7 +1978,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4668,7 +4668,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 34e62466d..0c4a0e15c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1959,7 +1959,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4644,7 +4644,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 903b3d7c9..159e6f416 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1933,7 +1933,7 @@ CONFIG_INFINIBAND=m
 # CONFIG_INFINIBAND_NES is not set
 # CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 # CONFIG_INFINIBAND_QIB is not set
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4565,7 +4565,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c0fce7828..24dd2e856 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1914,7 +1914,7 @@ CONFIG_INFINIBAND=m
 # CONFIG_INFINIBAND_NES is not set
 # CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 # CONFIG_INFINIBAND_QIB is not set
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4541,7 +4541,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e5a16ed02..1a55fbcce 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2172,7 +2172,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
-# CONFIG_INFINIBAND_BNXT_RE is not set
+CONFIG_INFINIBAND_BNXT_RE=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
@@ -2193,7 +2193,7 @@ CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_OPA_VNIC=m
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -5018,7 +5018,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b3b140ffb..6f856f04d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2153,7 +2153,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
-# CONFIG_INFINIBAND_BNXT_RE is not set
+CONFIG_INFINIBAND_BNXT_RE=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
@@ -2174,7 +2174,7 @@ CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_OPA_VNIC=m
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_RDMAVT=m
@@ -4996,7 +4996,8 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_SMC is not set
+CONFIG_SMC_DIAG=m
+CONFIG_SMC=m
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
diff --git a/kernel.spec b/kernel.spec
index fcaa77966..598026368 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1858,6 +1858,7 @@ fi
 %changelog
 * Wed Apr 11 2018 Laura Abbott <labbott@redhat.com>
 - Enable JFFS2 and some MTD modules (rhbz 1474493)
+- Enable a few infiniband options (rhbz 1291902)
 
 * Wed Apr 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git7.1
 - Linux v4.16-11490-gb284d4d5a678
diff --git a/rebase-notes.txt b/rebase-notes.txt
index baa9ab52b..c7d620a27 100644
--- a/rebase-notes.txt
+++ b/rebase-notes.txt
@@ -1,3 +1,6 @@
+Linux 4.17 rebase notes:
+- Turn off MTD + JFFS2 + extra infiniband options
+
 Linux 4.16 rebase notes:
 - Consider turning off all the IMA features?
 - F27 and earlier, disable vboxguest driver (to avoid conflict with the out of