Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc3.git2.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc3.git2.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc3.git2.1.vanilla.knurd.1.fc27

26 files changed, 12 insertions, 45 deletions

diff --git a/configs/fedora/generic/CONFIG_ARCH_TEGRA_194_SOC b/configs/fedora/generic/CONFIG_ARCH_TEGRA_194_SOC
deleted file mode 100644
index 719c9f05f..000000000
--- a/configs/fedora/generic/CONFIG_ARCH_TEGRA_194_SOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_TEGRA_194_SOC is not set
diff --git a/configs/fedora/generic/CONFIG_GPIO_TEGRA186 b/configs/fedora/generic/CONFIG_GPIO_TEGRA186
deleted file mode 100644
index ff21c5964..000000000
--- a/configs/fedora/generic/CONFIG_GPIO_TEGRA186
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_TEGRA186 is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC
new file mode 100644
index 000000000..685fc3436
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC
@@ -0,0 +1 @@
+CONFIG_ARCH_TEGRA_194_SOC=y
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_TEGRA186_CPUFREQ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
index f0e165dfb..f0e165dfb 100644
--- a/configs/fedora/generic/arm/CONFIG_ARM_TEGRA186_CPUFREQ
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186
new file mode 100644
index 000000000..90765ac52
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186
@@ -0,0 +1 @@
+CONFIG_GPIO_TEGRA186=m
diff --git a/gitrev b/gitrev
index cc5f56a83..b7a6fc969 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-d0fbad0aec1df29717fab736eb24c8a49cf2c70b
+06c85639897cf3ea6a11c5cb6929fb0d9d7efea5
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index eb4da2d7c..23f6d3f68 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -258,7 +258,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_SYNQUACER=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_186_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_THUNDER2=y
@@ -1933,7 +1933,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
+CONFIG_GPIO_TEGRA186=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 343db8365..dab55a442 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -258,7 +258,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_SYNQUACER=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_186_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_THUNDER2=y
@@ -1915,7 +1915,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
+CONFIG_GPIO_TEGRA186=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index fd2351d8d..a14c40616 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -260,7 +260,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA=y
@@ -367,7 +366,6 @@ CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_ARM_TEGRA186_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_ARM_THUMBEE=y
@@ -2053,7 +2051,6 @@ CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65218=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 317570643..1d2eb54d7 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -250,7 +250,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_TEGRA_2x_SOC is not set
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
 CONFIG_ARCH_TEGRA=y
@@ -354,7 +353,6 @@ CONFIG_ARM_SMMU=y
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_ARM_TEGRA186_CPUFREQ=m
 # CONFIG_ARM_TEGRA20_CPUFREQ is not set
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_ARM_THUMBEE=y
@@ -1952,7 +1950,6 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65910=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bc33a767e..c3fcf4667 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -250,7 +250,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_TEGRA_2x_SOC is not set
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
 CONFIG_ARCH_TEGRA=y
@@ -353,7 +352,6 @@ CONFIG_ARM_SMMU=y
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_ARM_TEGRA186_CPUFREQ=m
 # CONFIG_ARM_TEGRA20_CPUFREQ is not set
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_ARM_THUMBEE=y
@@ -1934,7 +1932,6 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65910=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 218015c6b..870d0e838 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -260,7 +260,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA=y
@@ -366,7 +365,6 @@ CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_ARM_TEGRA186_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_ARM_THUMBEE=y
@@ -2035,7 +2033,6 @@ CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65218=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7d5ecdec4..662c1965b 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -247,7 +247,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1763,7 +1762,6 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index faae078ee..15f769acb 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -247,7 +247,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1784,7 +1783,6 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 044913ec9..45463df5f 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -247,7 +247,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1784,7 +1783,6 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 4f75b5306..72e126711 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -247,7 +247,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1763,7 +1762,6 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 78071602b..ea02daac3 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -198,7 +198,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1687,7 +1686,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 746578c13..51c4e19e2 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -198,7 +198,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1666,7 +1665,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 7489ac1be..f465f1dad 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -191,7 +191,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1640,7 +1639,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 4d529dc50..0112d5713 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -191,7 +191,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1619,7 +1618,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 19f40ee11..182e38171 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -195,7 +195,6 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1617,7 +1616,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index a88e32426..de5ac65a9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -195,7 +195,6 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1596,7 +1595,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 87ad04d42..26d64790c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -250,7 +250,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1826,7 +1825,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 31737d452..dbe3e69d7 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -250,7 +250,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_TEGRA_194_SOC is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
@@ -1805,7 +1804,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
diff --git a/kernel.spec b/kernel.spec
index 8d1223f80..dc43fbe2e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -1857,6 +1857,9 @@ fi
 #
 #
 %changelog
+* Thu Jul 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git2.1
+- Linux v4.18-rc3-134-g06c85639897c
+
 * Tue Jul 03 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git1.1
 - Linux v4.18-rc3-107-gd0fbad0aec1d
 
diff --git a/sources b/sources
index 6a2470849..786793f74 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 SHA512 (patch-4.18-rc3.xz) = 9c6cb28585e1fa9e7b41a83314040c6b74fdb20c9a69041de9879412c92926f71aaac2c76f4f59c0ad25f06a2431ffa2fd2bd44c6413e7bb6ab078b90fa87f9d
-SHA512 (patch-4.18-rc3-git1.xz) = 4e8ab5b42d32b848dc591e27cf2bf52abaf5e0452e39c7fa40d359ebf1b9092c6ea49df7d053fde71a555beab0275f17fe22e4e86b30142546e1dcc2b38e7555
+SHA512 (patch-4.18-rc3-git2.xz) = 3cd103e8bce9970f3466da972519cc97a9110f5ff0cbd64fcbd80cfa2ce5bd419f06be0ba0eca8f8420b858f9d6c6acf2242f9f0bc6cbe0dda8d8b087dff2063