Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

43 files changed, 351 insertions, 87 deletions

diff --git a/arm-tegra-fix-nouveau-crash.patch b/arm-tegra-fix-nouveau-crash.patch
new file mode 100644
index 000000000..d1d7c61a6
--- /dev/null
+++ b/arm-tegra-fix-nouveau-crash.patch
@@ -0,0 +1,64 @@
+From 369971aa0101c4cfb84dacaaaa1b5cc5790c14ff Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding@nvidia.com>
+Date: Wed, 11 Apr 2018 10:34:17 +0200
+Subject: [PATCH] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping
+
+Depending on the kernel configuration, early ARM architecture setup code
+may have attached the GPU to a DMA/IOMMU mapping that transparently uses
+the IOMMU to back the DMA API. Tegra requires special handling for IOMMU
+backed buffers (a special bit in the GPU's MMU page tables indicates the
+memory path to take: via the SMMU or directly to the memory controller).
+Transparently backing DMA memory with an IOMMU prevents Nouveau from
+properly handling such memory accesses and causes memory access faults.
+
+As a side-note: buffers other than those allocated in instance memory
+don't need to be physically contiguous from the GPU's perspective since
+the GPU can map them into contiguous buffers using its own MMU. Mapping
+these buffers through the IOMMU is unnecessary and will even lead to
+performance degradation because of the additional translation.
+
+Signed-off-by: Thierry Reding <treding@nvidia.com>
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+index 1f07999aea1d..ac7706f56f6f 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+@@ -19,6 +19,11 @@
+  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  * DEALINGS IN THE SOFTWARE.
+  */
++
++#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
++#include <asm/dma-iommu.h>
++#endif
++
+ #include <core/tegra.h>
+ #ifdef CONFIG_NOUVEAU_PLATFORM_DRIVER
+ #include "priv.h"
+@@ -105,6 +110,20 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)
+ 	unsigned long pgsize_bitmap;
+ 	int ret;
+ 
++#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
++	if (dev->archdata.mapping) {
++		struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);
++
++		arm_iommu_release_mapping(mapping);
++		arm_iommu_detach_device(dev);
++
++		if (dev->archdata.dma_coherent)
++			set_dma_ops(dev, &arm_coherent_dma_ops);
++		else
++			set_dma_ops(dev, &arm_dma_ops);
++	}
++#endif
++
+ 	if (!tdev->func->iommu_bit)
+ 		return;
+ 
+-- 
+2.16.3
+
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/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS b/configs/fedora/generic/CONFIG_JFFS2_COMPRESSION_OPTIONS
index 947761785..947761785 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS
+++ b/configs/fedora/generic/CONFIG_JFFS2_COMPRESSION_OPTIONS
diff --git a/configs/fedora/generic/CONFIG_JFFS2_FS b/configs/fedora/generic/CONFIG_JFFS2_FS
index 1093b2329..4ccb0a39c 100644
--- a/configs/fedora/generic/CONFIG_JFFS2_FS
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS
@@ -1 +1 @@
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG b/configs/fedora/generic/CONFIG_JFFS2_FS_DEBUG
index 48fceb8b1..48fceb8b1 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_DEBUG
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL b/configs/fedora/generic/CONFIG_JFFS2_FS_POSIX_ACL
index 90c0295ac..90c0295ac 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_POSIX_ACL
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY b/configs/fedora/generic/CONFIG_JFFS2_FS_SECURITY
index 77ee2b1ab..77ee2b1ab 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_SECURITY
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY b/configs/fedora/generic/CONFIG_JFFS2_FS_WBUF_VERIFY
index eb19dca3e..eb19dca3e 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_WBUF_VERIFY
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER b/configs/fedora/generic/CONFIG_JFFS2_FS_WRITEBUFFER
index 67da74d2a..67da74d2a 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_WRITEBUFFER
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_XATTR b/configs/fedora/generic/CONFIG_JFFS2_FS_XATTR
index 61257de9d..61257de9d 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_XATTR
+++ b/configs/fedora/generic/CONFIG_JFFS2_FS_XATTR
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_LZO b/configs/fedora/generic/CONFIG_JFFS2_LZO
index ec14e80ac..ec14e80ac 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_LZO
+++ b/configs/fedora/generic/CONFIG_JFFS2_LZO
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RTIME b/configs/fedora/generic/CONFIG_JFFS2_RTIME
index 3d2ed3bd7..3d2ed3bd7 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RTIME
+++ b/configs/fedora/generic/CONFIG_JFFS2_RTIME
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RUBIN b/configs/fedora/generic/CONFIG_JFFS2_RUBIN
index 2e8d29c45..2e8d29c45 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RUBIN
+++ b/configs/fedora/generic/CONFIG_JFFS2_RUBIN
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_SUMMARY b/configs/fedora/generic/CONFIG_JFFS2_SUMMARY
index 5df8532b8..5df8532b8 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_SUMMARY
+++ b/configs/fedora/generic/CONFIG_JFFS2_SUMMARY
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_ZLIB b/configs/fedora/generic/CONFIG_JFFS2_ZLIB
index 961313691..961313691 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_ZLIB
+++ b/configs/fedora/generic/CONFIG_JFFS2_ZLIB
diff --git a/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD b/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD
index 4a942ccb5..3f0d93a89 100644
--- a/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD
+++ b/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD
@@ -1 +1 @@
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=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/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
index 1c741aa22..5975dfe01 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
+++ b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
@@ -1 +1 @@
-# CONFIG_DRM_EXYNOS_IOMMU is not set
+CONFIG_DRM_EXYNOS_IOMMU=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS_IOMMU b/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS_IOMMU
index 76ab03ad5..6a0844a77 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS_IOMMU
+++ b/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS_IOMMU
@@ -1 +1 @@
-# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_EXYNOS_IOMMU=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS b/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS
deleted file mode 100644
index 4ccb0a39c..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_JFFS2_FS=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 03f01ec95..c7f6bc359 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -28,9 +28,9 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2
 
 usbdrvs="atm image misc serial wusbcore"
 
-fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
+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 0f74ab089..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
@@ -2649,7 +2649,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3347,7 +3359,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
@@ -5235,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 0ca665675..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
@@ -2631,7 +2631,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3325,7 +3337,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
@@ -5212,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 193ed24f4..20c123d6e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1386,7 +1386,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_HDMI=y
-# CONFIG_DRM_EXYNOS_IOMMU is not set
+CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
@@ -1702,7 +1702,7 @@ CONFIG_EXYNOS5420_MCPM=y
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
-# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_EXYNOS_IOMMU=y
 CONFIG_EXYNOS_THERMAL=y
 # CONFIG_EZNPS_GIC is not set
 # CONFIG_EZX_PCAP is not set
@@ -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
@@ -3543,7 +3543,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS 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 b03df5b83..36f707b0a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1328,7 +1328,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_HDMI=y
-# CONFIG_DRM_EXYNOS_IOMMU is not set
+CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
@@ -1611,7 +1611,7 @@ CONFIG_EXYNOS5420_MCPM=y
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
-# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_EXYNOS_IOMMU=y
 CONFIG_EXYNOS_THERMAL=y
 # CONFIG_EZNPS_GIC is not set
 # CONFIG_EZX_PCAP is not set
@@ -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
@@ -3375,7 +3375,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS 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 2da45d6f8..2d8d79cf3 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1318,7 +1318,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_HDMI=y
-# CONFIG_DRM_EXYNOS_IOMMU is not set
+CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
@@ -1601,7 +1601,7 @@ CONFIG_EXYNOS5420_MCPM=y
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
-# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_EXYNOS_IOMMU=y
 CONFIG_EXYNOS_THERMAL=y
 # CONFIG_EZNPS_GIC is not set
 # CONFIG_EZX_PCAP is not set
@@ -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
@@ -3353,7 +3353,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS 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 8b274ee60..e79bc3e44 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1376,7 +1376,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_HDMI=y
-# CONFIG_DRM_EXYNOS_IOMMU is not set
+CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
@@ -1692,7 +1692,7 @@ CONFIG_EXYNOS5420_MCPM=y
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
-# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_EXYNOS_IOMMU=y
 CONFIG_EXYNOS_THERMAL=y
 # CONFIG_EZNPS_GIC is not set
 # CONFIG_EZX_PCAP is not set
@@ -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
@@ -3521,7 +3521,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS 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 de72c69b0..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
@@ -2510,7 +2510,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3182,7 +3194,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4896,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 6fa6ac1fc..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
@@ -2529,7 +2529,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3203,7 +3215,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4918,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 0e817d541..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
@@ -2529,7 +2529,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3203,7 +3215,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4918,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 602b8aa58..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
@@ -2510,7 +2510,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3182,7 +3194,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4896,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 9fcab38f0..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
@@ -2373,7 +2373,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3028,7 +3040,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4719,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 ab9ea4ff5..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
@@ -2354,7 +2354,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3005,7 +3017,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4695,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 47c7eec0d..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
@@ -2318,7 +2318,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -2972,7 +2984,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4656,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 6f9b43b14..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
@@ -2299,7 +2299,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -2949,7 +2961,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4632,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 03fd65f13..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
@@ -2272,7 +2272,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -2915,7 +2927,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4553,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 5c466efac..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
@@ -2253,7 +2253,19 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -2892,7 +2904,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4529,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 2b2f89ecb..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
@@ -2589,7 +2589,19 @@ CONFIG_IXGB=m
 # CONFIG_JAILHOUSE_GUEST is not set
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3255,7 +3267,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -5006,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 ea1e38ed7..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
@@ -2570,7 +2570,19 @@ CONFIG_IXGB=m
 # CONFIG_JAILHOUSE_GUEST is not set
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
@@ -3234,7 +3246,7 @@ CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
 CONFIG_MTD_CFI_I1=y
@@ -4984,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 108347658..ee1dab64f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -600,6 +600,8 @@ Patch304: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
 # https://marc.info/?l=linux-kernel&m=152328880417846&w=2
 Patch308: arm64-thunderx-crypto-zip-fixes.patch
 
+Patch309: arm-tegra-fix-nouveau-crash.patch
+
 # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
 Patch320: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
 
@@ -1876,6 +1878,14 @@ fi
 #
 #
 %changelog
+* Thu Apr 12 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Patch to fix nouveau on Tegra platforms
+- Enable IOMMU on Exynos now upstream does
+
+* 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