merge masterkernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29

25 files changed, 70 insertions, 4 deletions

diff --git a/configs/fedora/generic/CONFIG_CHROMEOS_TBMC b/configs/fedora/generic/CONFIG_CHROMEOS_TBMC
new file mode 100644
index 000000000..9252aafa4
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_CHROMEOS_TBMC
@@ -0,0 +1 @@
+# CONFIG_CHROMEOS_TBMC is not set
diff --git a/configs/fedora/generic/CONFIG_DMA_API_DEBUG_SG b/configs/fedora/generic/CONFIG_DMA_API_DEBUG_SG
new file mode 100644
index 000000000..0611a5d79
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DMA_API_DEBUG_SG
@@ -0,0 +1 @@
+# CONFIG_DMA_API_DEBUG_SG is not set
diff --git a/configs/fedora/generic/CONFIG_SPI_MEM b/configs/fedora/generic/CONFIG_SPI_MEM
new file mode 100644
index 000000000..896082297
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SPI_MEM
@@ -0,0 +1 @@
+# CONFIG_SPI_MEM is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SPI_MEM b/configs/fedora/generic/arm/armv7/CONFIG_SPI_MEM
new file mode 100644
index 000000000..118458c27
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_SPI_MEM
@@ -0,0 +1 @@
+CONFIG_SPI_MEM=y
diff --git a/gitrev b/gitrev
index 29d173874..79cef0094 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-dd52cb879063ca5470d5a093c32180ba74fa528e
+9214407d1237a985894894f9be2b1a7416b69d14
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3fd70ca24..dae0e2ae0 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -894,6 +894,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1288,6 +1289,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 CONFIG_DMA_CMA=y
@@ -5762,6 +5764,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index dd0ff6467..89b21f312 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -894,6 +894,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1280,6 +1281,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_BCM2835=m
 CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -5738,6 +5740,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 61c6171b2..390c9c580 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -935,6 +935,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1342,6 +1343,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
@@ -6192,6 +6194,7 @@ CONFIG_SPI_IMX=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_MXS=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8cf12a5a6..1deaee84b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -906,6 +906,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1287,6 +1288,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
@@ -5806,6 +5808,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 40507ccba..5945104e7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -905,6 +905,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1278,6 +1279,7 @@ CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
@@ -5782,6 +5784,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5418f671f..4c6504eb4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -934,6 +934,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1333,6 +1334,7 @@ CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
@@ -6168,6 +6170,7 @@ CONFIG_SPI_IMX=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_MXS=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 121708c1b..71aaf7d8a 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -771,6 +771,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1121,6 +1122,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
@@ -5407,6 +5409,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d02b8373e..6db0a104a 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -774,6 +774,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1132,6 +1133,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5432,6 +5434,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 95f708f64..ba6c67546 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -774,6 +774,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1132,6 +1133,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5432,6 +5434,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 5473e7715..f835ca5e9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -771,6 +771,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1121,6 +1122,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
@@ -5407,6 +5409,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 578e5f307..b33c5ace0 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -757,6 +757,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1101,6 +1102,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5203,6 +5205,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 166b1a8e0..65e737495 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -754,6 +754,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1090,6 +1091,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
@@ -5176,6 +5178,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index d42a27fb0..c07933b96 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -713,6 +713,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1056,6 +1057,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5130,6 +5132,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ad292d36d..6846f4f77 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -710,6 +710,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
@@ -1045,6 +1046,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
@@ -5103,6 +5105,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index c64fd0b1b..317cad3a8 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -715,6 +715,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHSC_SCH=m
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
@@ -1056,6 +1057,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5023,6 +5025,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 03ce5ef41..4e1e43a96 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -712,6 +712,7 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHSC_SCH=m
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
@@ -1045,6 +1046,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMADEVICES is not set
@@ -4996,6 +4998,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c3968c12a..60b221431 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -788,6 +788,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CHT_WC_PMIC_OPREGION=y
@@ -1179,6 +1180,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
+# CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMADEVICES_DEBUG=y
@@ -5519,6 +5521,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cf2240253..2410eb018 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -785,6 +785,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CHT_WC_PMIC_OPREGION=y
@@ -1168,6 +1169,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
@@ -5494,6 +5496,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
diff --git a/kernel.spec b/kernel.spec
index 2bbbb1672..0a67ce5b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -1876,6 +1876,12 @@ fi
 #
 #
 %changelog
+* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git1.1
+- Linux v4.17-505-g9214407d1237
+
+* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
 * Mon Jun 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-1
 - Linux v4.17
 - Disable debugging options.
@@ -3160,6 +3166,7 @@ fi
 - Linux v4.11-1464-gd3b5d35
 - Reenable debugging options.
 
+<<<<<<< HEAD
 * Mon May 01 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-1
 - Linux v4.11
 
diff --git a/sources b/sources
index 0144b07e0..278a58886 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
+SHA512 (patch-4.17-git1.xz) = 72d5b961ce2a577fa8cbe406be47148f0f796e84c0038af635b2a80483c1ac9bed36f07a245a7073b11292ebd43d7dc60ab7ea25430b0bdd4f0027aa3473c1cf