Merge remote-tracking branch 'up/master' into master-riscv64

kernel.spec

@@ -69,9 +69,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 3
+%global rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -124,7 +124,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 0
+%define debugbuildsenabled 1
 
 # Kernel headers are being split out into a separate package
 %if 0%{?fedora}
@@ -533,9 +533,6 @@ Patch302: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
 # rhbz 1574718
 Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
 
-# http://www.spinics.net/lists/linux-tegra/msg26029.html
-Patch304: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
-# http://patchwork.ozlabs.org/patch/587554/
 Patch305: ARM-tegra-usb-no-reset.patch
 
 # https://patchwork.kernel.org/patch/11173461/
@@ -1793,6 +1790,12 @@ fi
 #
 #
 %changelog
+* Mon Oct 21 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc4.git0.1
+- Linux v5.4-rc4
+
+* Mon Oct 21 2019 Jeremy Cline <jcline@redhat.com>
+- Disable debugging options.
+
 * Fri Oct 18 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc3.git2.1
 - Linux v5.4-rc3-99-g0e2adab6cf28
 

sources

@@ -1,3 +1,2 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
-SHA512 (patch-5.4-rc3.xz) = 7edb09d2b3b35b69a6ba5725c78a1ff12bd7cf10406d361e7f86908b7af24d74d3c6199c4e2574bc059701463ecb2a25c11d27348a71515661c26a3c8e600ac9
-SHA512 (patch-5.4-rc3-git2.xz) = 7421a40bbea7e8ec4617ebf7666471a6b7bdee625a4d1ee7664c543726674baa6e69be1f038c9f43685a23fe178f39ae462aa31fb7252f0e2bbe40667a6a9979
+SHA512 (patch-5.4-rc4.xz) = f32de3fce8cde74450b5cb6a81ffc63a53b0a4492ec1b57a77d3b8bb77d66292cfeeb08edb12c53b2a8f7fc747060832a0cf6f1d5b825d32b161898376fad302

usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch

@@ -1,53 +0,0 @@
-From patchwork Wed Apr  6 07:54:05 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: usb: phy: tegra: Add 38.4MHz clock table entry
-From: Hunter Laux <hunterlaux@gmail.com>
-X-Patchwork-Id: 606877
-Message-Id: <1459929245-23449-1-git-send-email-hunterlaux@gmail.com>
-To: Stephen Warren <swarren@wwwdotorg.org>,
- Thierry Reding <thierry.reding@gmail.com>,
- Alexandre Courbot <gnurou@gmail.com>, linux-tegra@vger.kernel.org
-Cc: Hunter Laux <hunterlaux@gmail.com>
-Date: Wed,  6 Apr 2016 00:54:05 -0700
-
-The Tegra210 uses a 38.4MHz OSC. This clock table entry is required to
-use the ehci phy on the Jetson TX1.
-
-The xtal_freq_count is actually a 12 bit value, so it should be a u16
-instead of u8.
-
-Signed-off-by: Hunter Laux <hunterlaux@gmail.com>
----
- drivers/usb/phy/phy-tegra-usb.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
-index 5fe4a57..f0431f0 100644
---- a/drivers/usb/phy/phy-tegra-usb.c
-+++ b/drivers/usb/phy/phy-tegra-usb.c
-@@ -164,7 +164,7 @@ struct tegra_xtal_freq {
- 	u8 enable_delay;
- 	u8 stable_count;
- 	u8 active_delay;
--	u8 xtal_freq_count;
-+	u16 xtal_freq_count;
- 	u16 debounce;
- };
- 
-@@ -201,6 +201,14 @@ static const struct tegra_xtal_freq tegra_freq_table[] = {
- 		.xtal_freq_count = 0xFE,
- 		.debounce = 0xFDE8,
- 	},
-+	{
-+		.freq = 38400000,
-+		.enable_delay = 0x00,
-+		.stable_count = 0x00,
-+		.active_delay = 0x18,
-+		.xtal_freq_count = 0x177,
-+		.debounce = 0xBB80,
-+	},
- };
- 
- static void set_pts(struct tegra_usb_phy *phy, u8 pts_val)