Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc5.git2.1.vanilla.knurd.1.fc29

13 files changed, 32 insertions, 25 deletions

diff --git a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808 b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
index 129ad891c..f99a3cf06 100644
--- a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
+++ b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
@@ -1 +1 @@
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_RK808 b/configs/fedora/generic/arm/CONFIG_MFD_RK808
index 097860adb..305b2914f 100644
--- a/configs/fedora/generic/arm/CONFIG_MFD_RK808
+++ b/configs/fedora/generic/arm/CONFIG_MFD_RK808
@@ -1 +1 @@
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
diff --git a/configs/fedora/generic/arm/CONFIG_PWM b/configs/fedora/generic/arm/CONFIG_PWM
deleted file mode 100644
index 346c909b6..000000000
--- a/configs/fedora/generic/arm/CONFIG_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM=y
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808 b/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
index 171bdf44e..71ebac06e 100644
--- a/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
@@ -1 +1 @@
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
diff --git a/gitrev b/gitrev
index dc97802b0..48ec47403 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-211b100a5ceda9d1856a3f84334f9ca5f680b638
+c307aaf3eb47969105887e4e8991ec00960a7ce8
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a01cac224..8dc4af80e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -992,7 +992,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -3320,7 +3320,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4819,7 +4819,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index da2371212..e40eda739 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -992,7 +992,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -3299,7 +3299,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4796,7 +4796,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index defea7467..a9582e003 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1023,7 +1023,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3487,7 +3487,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -5101,7 +5101,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 2fd50f2e9..4a454ab5e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -990,7 +990,7 @@ CONFIG_CNIC=m
 CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3337,7 +3337,7 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4814,7 +4814,7 @@ CONFIG_REGULATOR_PV88060=m
 # CONFIG_REGULATOR_PV88080 is not set
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index baf16c6cb..fac967b68 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -989,7 +989,7 @@ CONFIG_CNIC=m
 CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3316,7 +3316,7 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4791,7 +4791,7 @@ CONFIG_REGULATOR_PV88060=m
 # CONFIG_REGULATOR_PV88080 is not set
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 368aca682..8cf089b45 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1022,7 +1022,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3466,7 +3466,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -5078,7 +5078,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel.spec b/kernel.spec
index 235640bac..be71ef342 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # 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
 
 # Kernel headers are being split out into a separate package
 %define with_headers 0
@@ -1896,6 +1896,13 @@ fi
 #
 #
 %changelog
+* Wed Sep 26 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc5.git2.1
+- Linux v4.19-rc5-143-gc307aaf3eb47
+
+* Tue Sep 25 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc5.git1.1
+- Linux v4.19-rc5-99-g8c0f9f5b309d
+- Re-enable debugging options.
+
 * Mon Sep 24 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc5.git0.1
 - Linux v4.19-rc5
 
diff --git a/sources b/sources
index 95bb7e30b..a8c301b3b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 SHA512 (patch-4.19-rc5.xz) = 9a2a19b58c30e2f5e2542c1ccd911f5c74398201fdb9473d66f69a231eb07550efc52220ccc24c02593a19dea100d468b12741a8fcb511aea3ab7bc892db71b7
+SHA512 (patch-4.19-rc5-git2.xz) = 15e2a80bb122fc9d4909d5751faffdfa4b3e88255b47c85e43706cf641ba07e8626104fd82a190a1e1f5f36f0d9bb53feaccff32163cbd4089ee2ca611a22638