summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-09 17:04:58 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-09 17:04:58 +0200
commitb9c24813b8540d249dc8e626a3d2ea7d49fd9c87 (patch)
treeed2c54f7a9b2d17700741f5e5df29e7f2efa7d1c
parent0ab543f691677a399c3113b282570ce3ac3a431f (diff)
parent14d239184a721485a823f30f5aede1c6190558ad (diff)
downloadkernel-b9c24813b8540d249dc8e626a3d2ea7d49fd9c87.tar.gz
kernel-b9c24813b8540d249dc8e626a3d2ea7d49fd9c87.tar.xz
kernel-b9c24813b8540d249dc8e626a3d2ea7d49fd9c87.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedorakernel-5.7.8-250.vanilla.knurd.1.fc32
-rw-r--r--0001-acpi-prefer-booting-with-ACPI-over-DTS.patch56
-rw-r--r--kernel.spec7
-rw-r--r--sources2
3 files changed, 6 insertions, 59 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
deleted file mode 100644
index e188b5a2d..000000000
--- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Salter <msalter@redhat.com>
-Date: Fri, 11 May 2018 21:01:17 -0400
-Subject: [PATCH] acpi: prefer booting with ACPI over DTS
-
-Message-id: <20180511210117.10457-1-msalter@redhat.com>
-Patchwork-id: 214708
-O-Subject: [RHEL-8 BZ1576869] [RHEL only] acpi: prefer booting with ACPI over DTS
-Bugzilla: 1576869
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
-RH-Acked-by: Dean Nelson <dnelson@redhat.com>
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576869
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16208479
-Testing: Verified kernel defaults to ACPI on Mustang
-
-From: Jonathan Toppins <jtoppins@redhat.com>
-
- This patch forces ACPI boot tables to be preferred over DTS.
-
- Currently for ACPI to be used a user either has to set acpi=on on the
- kernel command line or make sure any device tree passed to the kernel
- is empty. If the dtb passed to the kernel is non-empty then device-tree
- will be chosen as the boot method of choice.
-
- RHEL does not wish to support this boot method so change table boot
- preferences to use ACPI. In the event ACPI table checks fail the kernel
- will fallback to using DTS to boot.
-
- Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Mark Salter <msalter@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- arch/arm64/kernel/acpi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index a100483b47c4..29f693734edb 100644
---- a/arch/arm64/kernel/acpi.c
-+++ b/arch/arm64/kernel/acpi.c
-@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */
- EXPORT_SYMBOL(acpi_pci_disabled);
-
- static bool param_acpi_off __initdata;
--static bool param_acpi_on __initdata;
-+static bool param_acpi_on __initdata = true;
- static bool param_acpi_force __initdata;
-
- static int __init parse_acpi(char *arg)
---
-2.26.2
-
diff --git a/kernel.spec b/kernel.spec
index bae428e08..ea17da514 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -98,7 +98,7 @@ Summary: The Linux kernel
%define stable_rc 0
# Do we have a -stable update to apply?
-%define stable_update 7
+%define stable_update 8
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -813,7 +813,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz
Patch6: 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch
Patch8: 0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch
Patch9: 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch
-Patch10: 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
Patch11: 0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
Patch12: 0001-kdump-add-support-for-crashkernel-auto.patch
Patch15: 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
@@ -2990,6 +2989,10 @@ fi
#
#
%changelog
+* Thu Jul 09 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.8-200
+- Linux v5.7.8
+- Fixes (rhbz 1852944 1852942 1852963 1852962)
+
* Wed Jul 01 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.7-200
- Linux v5.7.7
diff --git a/sources b/sources
index 04b13822f..1ea40e90c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.7.tar.xz) = 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
-SHA512 (patch-5.7.7.xz) = 1c19cb65d11a8498d4987574a973e1c3b2df6966c975d2edbfde902795f656139e6736a53b817c8567cc6cda614b5d8c2530bd50159d37ddad9312a17a125bc7
+SHA512 (patch-5.7.8.xz) = 4820a45fba9fa299181a96598a96bbdbf6f5faaf1862173d9cca3cc5ea84c21d8e7d4baf0601697565fad3b7d3c76085f4ac86a726961b62c356d70968edc48f