Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc1.git3.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc1.git3.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc1.git3.1.vanilla.knurd.1.fc29kernel-5.2.0-0.rc1.git3.1.vanilla.knurd.1.fc28

9 files changed, 18 insertions, 9 deletions

diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1418040 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1418040
new file mode 100644
index 000000000..06e9dc0ef
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1418040
@@ -0,0 +1 @@
+CONFIG_ARM64_ERRATUM_1418040=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225
new file mode 100644
index 000000000..3e0b01e04
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225
@@ -0,0 +1 @@
+CONFIG_ARM64_ERRATUM_1463225=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPMH b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPMH
index a50b7ed9b..54f185edc 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPMH
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPMH
@@ -1 +1 @@
-CONFIG_QCOM_CLK_RPMH=m
+CONFIG_QCOM_CLK_RPMH=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPMH b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPMH
index db681ac6c..30470922d 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPMH
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPMH
@@ -1 +1 @@
-CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_RPMH=y
diff --git a/gitrev b/gitrev
index a6a7f2bb9..d125adfe2 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-54dee406374ce8adb352c48e175176247cb8db7c
+0a72ef89901409847036664c23ba6eee7cf08e0e
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 259eb7484..1ce328426 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -289,6 +289,8 @@ CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1188873=y
 CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1418040=y
+CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -4722,7 +4724,7 @@ CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_QCOM_CLK_APCS_MSM8916=m
-CONFIG_QCOM_CLK_RPMH=m
+CONFIG_QCOM_CLK_RPMH=y
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
@@ -4912,7 +4914,7 @@ CONFIG_REGULATOR_PFUZE100=m
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index d2113d3f3..8144b3921 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -289,6 +289,8 @@ CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1188873=y
 CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1418040=y
+CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -4701,7 +4703,7 @@ CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_QCOM_CLK_APCS_MSM8916=m
-CONFIG_QCOM_CLK_RPMH=m
+CONFIG_QCOM_CLK_RPMH=y
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
@@ -4891,7 +4893,7 @@ CONFIG_REGULATOR_PFUZE100=m
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
diff --git a/kernel.spec b/kernel.spec
index 5ed08cce3..5be72e9c9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1838,6 +1838,9 @@ fi
 #
 #
 %changelog
+* Fri May 24 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc1.git3.1
+- Linux v5.2-rc1-233-g0a72ef899014
+
 * Wed May 22 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc1.git2.1
 - Linux v5.2-rc1-165-g54dee406374c
 
diff --git a/sources b/sources
index f64722559..6c46ca80a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 SHA512 (patch-5.2-rc1.xz) = 771b53ee920488daf3e36bfa7a38d75b0ab165453d94137d289f4bab59da38251f7c94a63d2f5138bc226c3b4908a9153a3056f1aa19be5317cbe42d0ad4bd2a
-SHA512 (patch-5.2-rc1-git2.xz) = 2fe420c651894b772ef6cc6dfef1f173dd0c7034ce468bb2f1fb2e5accc29e58b25910710b74e63ac70e5f9b92015ff7c7d586c607be31770246f16f5c5e4b89
+SHA512 (patch-5.2-rc1-git3.xz) = 9579898229a45da11433fb97cc4f2bc4cda0a708b52d4bb96c9fa8548cd49c4cec6a162b9b2cd68bb71ffbaa1e3a2637c7d8f348cff3f809b6051dac96e28e54