Linux v4.14-12891-gc8a0739b185d

Also turn off a powerpc crypto drive that was failing to compile

32 files changed, 142 insertions, 113 deletions

diff --git a/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch b/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
deleted file mode 100644
index 2242e2d44..000000000
--- a/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0e9df6a74f9573409e5a2fbe29c1389188280bfc Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 5 Oct 2017 16:02:33 +0200
-Subject: [PATCH] platform/x86: peaq-wmi: Add DMI check before binding to the
- WMI interface
-
-It seems that the WMI GUID used by the PEAQ 2-in-1 WMI hotkeys is not
-as unique as a GUID should be and is used on some other devices too.
-
-This is causing spurious key-press reports on these other devices.
-
-This commits adds a DMI check to the PEAQ 2-in-1 WMI hotkeys driver to
-ensure that it is actually running on a PEAQ 2-in-1, fixing the
-spurious key-presses on these other devices.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1497861
-BugLink: https://bugzilla.suse.com/attachment.cgi?id=743182
-Cc: stable@vger.kernel.org
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/peaq-wmi.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c
-index bc98ef95514a..67fa3fa32011 100644
---- a/drivers/platform/x86/peaq-wmi.c
-+++ b/drivers/platform/x86/peaq-wmi.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include <linux/acpi.h>
-+#include <linux/dmi.h>
- #include <linux/input-polldev.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -64,8 +65,23 @@ static void peaq_wmi_poll(struct input_polled_dev *dev)
- 	}
- }
- 
-+/* Some other devices (Shuttle XS35) use the same WMI GUID for other purposes */
-+static const struct dmi_system_id peaq_dmi_table[] = {
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
-+		},
-+	},
-+	{}
-+};
-+
- static int __init peaq_wmi_init(void)
- {
-+	/* WMI GUID is not unique, also check for a DMI match */
-+	if (!dmi_check_system(peaq_dmi_table))
-+		return -ENODEV;
-+
- 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
- 		return -ENODEV;
- 
-@@ -86,6 +101,9 @@ static int __init peaq_wmi_init(void)
- 
- static void __exit peaq_wmi_exit(void)
- {
-+	if (!dmi_check_system(peaq_dmi_table))
-+		return;
-+
- 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
- 		return;
- 
--- 
-2.14.2
-
diff --git a/configs/base-generic/CONFIG_GUP_BENCHMARK b/configs/base-generic/CONFIG_GUP_BENCHMARK
new file mode 100644
index 000000000..f978e4899
--- /dev/null
+++ b/configs/base-generic/CONFIG_GUP_BENCHMARK
@@ -0,0 +1 @@
+# CONFIG_GUP_BENCHMARK is not set
diff --git a/configs/base-generic/CONFIG_HWSPINLOCK b/configs/base-generic/CONFIG_HWSPINLOCK
index e35b793e2..6b531e93f 100644
--- a/configs/base-generic/CONFIG_HWSPINLOCK
+++ b/configs/base-generic/CONFIG_HWSPINLOCK
@@ -1 +1 @@
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
diff --git a/configs/base-generic/CONFIG_NTB_SWITCHTEC b/configs/base-generic/CONFIG_NTB_SWITCHTEC
new file mode 100644
index 000000000..36258733e
--- /dev/null
+++ b/configs/base-generic/CONFIG_NTB_SWITCHTEC
@@ -0,0 +1 @@
+CONFIG_NTB_SWITCHTEC=m
diff --git a/configs/base-generic/CONFIG_RPMSG_VIRTIO b/configs/base-generic/CONFIG_RPMSG_VIRTIO
new file mode 100644
index 000000000..78f0867f1
--- /dev/null
+++ b/configs/base-generic/CONFIG_RPMSG_VIRTIO
@@ -0,0 +1 @@
+CONFIG_RPMSG_VIRTIO=m
diff --git a/configs/base-generic/CONFIG_TEST_FIND_BIT b/configs/base-generic/CONFIG_TEST_FIND_BIT
new file mode 100644
index 000000000..23788bfbd
--- /dev/null
+++ b/configs/base-generic/CONFIG_TEST_FIND_BIT
@@ -0,0 +1 @@
+# CONFIG_TEST_FIND_BIT is not set
diff --git a/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX
index fd145f04f..47b9dbe8a 100644
--- a/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_NX=y
+# CONFIG_CRYPTO_DEV_NX is not set
diff --git a/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM
new file mode 100644
index 000000000..2ba638248
--- /dev/null
+++ b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM
@@ -0,0 +1 @@
+CONFIG_DELL_SMBIOS_SMM=m
diff --git a/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI
new file mode 100644
index 000000000..0e3f3d8de
--- /dev/null
+++ b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI
@@ -0,0 +1 @@
+CONFIG_DELL_SMBIOS_WMI=m
diff --git a/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT b/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT
new file mode 100644
index 000000000..05356f742
--- /dev/null
+++ b/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT
@@ -0,0 +1 @@
+CONFIG_INTEL_WMI_THUNDERBOLT=m
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index f7e1ffff1..430bfd095 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -1,3 +1,4 @@
+From 235b02d70a6a9837896c2ff4ca9d03f172cc4281 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Wed, 30 Jan 2013 10:55:31 -0500
 Subject: [PATCH] criu: no expert
@@ -9,24 +10,27 @@ Upstream-status: Fedora mustard
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index 648bb79d6b73..860ca236975f 100644
+index 2934249fba46..19d9ee8c120b 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK
+@@ -871,7 +871,7 @@ config SOCK_CGROUP_DATA
  endif # CGROUPS
  
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	select PROC_CHILDREN
- 	default n
- 	help
-@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
  menuconfig NAMESPACES
 -	bool "Namespaces support" if EXPERT
 +	bool "Namespaces support"
  	depends on MULTIUSER
  	default !EXPERT
  	help
+@@ -1321,7 +1321,7 @@ config MEMBARRIER
+ 	  If unsure, say Y.
+ 
+ config CHECKPOINT_RESTORE
+-	bool "Checkpoint/restore support" if EXPERT
++	bool "Checkpoint/restore support"
+ 	select PROC_CHILDREN
+ 	default n
+ 	help
+-- 
+2.14.3
+
diff --git a/gitrev b/gitrev
index b4cdf2a7a..fa36c369c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-2dcd9c71c1ffa9a036e09047f60e08383bb0abb6
+c8a0739b185d11d6e2ca7ad9f5835841d1cfc765
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 03348af52..84390f657 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1814,6 +1814,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2021,8 +2022,8 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3883,6 +3884,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4517,6 +4519,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5689,6 +5692,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 5cd5110cd..c6a5a04dd 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1797,6 +1797,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2004,8 +2005,8 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3862,6 +3863,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4495,6 +4497,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5666,6 +5669,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 9cd4d2ef1..3f332e9c3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1949,6 +1949,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 CONFIG_GS_FPGABOOT=m
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2155,9 +2156,9 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -4127,6 +4128,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NVEC_PAZ00=y
@@ -4854,6 +4856,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -6171,6 +6174,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8e7bb137b..709809178 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1843,6 +1843,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2047,7 +2048,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3948,6 +3949,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NVME_FC=m
@@ -4560,6 +4562,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5771,6 +5774,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 56477ef02..be8f387c4 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1826,6 +1826,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2030,7 +2031,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3927,6 +3928,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NVME_FC=m
@@ -4538,6 +4540,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5748,6 +5751,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 896934daf..6d97033f0 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1932,6 +1932,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 CONFIG_GS_FPGABOOT=m
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2138,9 +2139,9 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -4106,6 +4107,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NVEC_PAZ00=y
@@ -4832,6 +4834,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -6148,6 +6151,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 465adddc7..c5d9b8b68 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1032,6 +1032,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1675,6 +1677,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1886,7 +1889,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2196,6 +2199,7 @@ CONFIG_INTEL_SOC_PMIC=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -3738,6 +3742,7 @@ CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA is not set
@@ -4229,6 +4234,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5337,6 +5343,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index adfef06db..46c6b9a64 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1042,6 +1042,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1693,6 +1695,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1904,7 +1907,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2214,6 +2217,7 @@ CONFIG_INTEL_SOC_PMIC=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -3758,6 +3762,7 @@ CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA is not set
@@ -4250,6 +4255,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5359,6 +5365,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8a710102a..a8cfb6b69 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1042,6 +1042,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1693,6 +1695,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1904,7 +1907,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2214,6 +2217,7 @@ CONFIG_INTEL_SOC_PMIC=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -3758,6 +3762,7 @@ CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA is not set
@@ -4250,6 +4255,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5359,6 +5365,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 4ffb7d0b6..1842d9875 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1032,6 +1032,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1675,6 +1677,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1886,7 +1889,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2196,6 +2199,7 @@ CONFIG_INTEL_SOC_PMIC=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -3738,6 +3742,7 @@ CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA is not set
@@ -4229,6 +4234,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5337,6 +5343,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 12233e7bf..5506d94f7 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -855,7 +855,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX=y
+# CONFIG_CRYPTO_DEV_NX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -1598,6 +1598,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1801,7 +1802,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3578,6 +3579,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4061,6 +4063,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5137,6 +5140,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index da6e3e97a..1857e1f19 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -853,7 +853,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX=y
+# CONFIG_CRYPTO_DEV_NX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -1580,6 +1580,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1783,7 +1784,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3556,6 +3557,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4038,6 +4040,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5113,6 +5116,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ac76287fc..9c949659d 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -809,7 +809,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX=y
+# CONFIG_CRYPTO_DEV_NX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -1551,6 +1551,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1753,7 +1754,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3522,6 +3523,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4000,6 +4002,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5065,6 +5068,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 10fd45f20..1ca002c68 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -807,7 +807,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX=y
+# CONFIG_CRYPTO_DEV_NX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -1533,6 +1533,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1735,7 +1736,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3500,6 +3501,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -3977,6 +3979,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5041,6 +5044,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 15aa68eb2..2d64fe0a8 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1524,6 +1524,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1714,7 +1715,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3455,6 +3456,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3893,6 +3895,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -4959,6 +4962,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2b8928bdd..7a1c9da72 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1506,6 +1506,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1696,7 +1697,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -3433,6 +3434,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3870,6 +3872,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -4935,6 +4938,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 1daa2df74..46ab4c8eb 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1081,6 +1081,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1734,6 +1736,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1945,7 +1948,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2268,6 +2271,7 @@ CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3808,6 +3812,7 @@ CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
 CONFIG_NTB_PERF=m
 CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_TOOL=m
 CONFIG_NTB_TRANSPORT=m
 # CONFIG_NTFS_FS is not set
@@ -4292,6 +4297,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5410,6 +5416,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 8dd51b7f0..64d6c2a26 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1071,6 +1071,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1716,6 +1718,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1927,7 +1930,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2250,6 +2253,7 @@ CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3788,6 +3792,7 @@ CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
 CONFIG_NTB_PERF=m
 CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_TOOL=m
 CONFIG_NTB_TRANSPORT=m
 # CONFIG_NTFS_FS is not set
@@ -4271,6 +4276,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5388,6 +5394,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
diff --git a/kernel.spec b/kernel.spec
index 7080766cc..e0bf60a42 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -625,9 +625,6 @@ Patch617: Fix-for-module-sig-verification.patch
 # rhbz 1431375
 Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 
-# rhbz 1497861, submitted upstream, Cc: Stable
-Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
-
 # rhbz 1509461
 Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
 
@@ -2190,6 +2187,9 @@ fi
 #
 #
 %changelog
+* Mon Nov 20 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git6.1
+- Linux v4.14-12891-gc8a0739b185d
+
 * Sat Nov 18 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git5.1
 - Linux v4.14-12375-g2dcd9c71c1ff
 
diff --git a/sources b/sources
index 72b55f0ea..3a3d21c76 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
-SHA512 (patch-4.14-git5.xz) = d6b09f62984080f44e6f6491a51df0ba57e17cc1f41745f50d39301077a6a35c549facf87f11bc7af62dd976e1f3b6d49f65da76b84b892a44955e170270590e
+SHA512 (patch-4.14-git6.xz) = d2d6bd157ea097c35964ea71a871797d12cbfedfdc30be58b0bd064c857b5799a9dcfa02435b839246140855368cc8d049303b9225d999e31eaa9f8698924969