summaryrefslogtreecommitdiffstats
path: root/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-03 13:47:28 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-03 13:47:28 -0500
commit95dc4cf28c756d993d2080a495935006100a62a2 (patch)
treeaf11132f73d16ba11373f61a12eb6b1c9c8f4d69 /0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
parent49d6a971ac73ed6e56c93207c43272f54630d01b (diff)
downloadkernel-95dc4cf28c756d993d2080a495935006100a62a2.tar.gz
kernel-95dc4cf28c756d993d2080a495935006100a62a2.tar.xz
kernel-95dc4cf28c756d993d2080a495935006100a62a2.zip
kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1
* Wed Jun 03 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200603gitd6f9469a03d8.1] - d6f9469a03d8 rebase - Fix configs for Fedora ("Justin M. Forbes") - Fix update_scripts.sh unselective pattern sub (David Howells) - Updated changelog for the release based on b0c3ba31be3e ("CKI@GitLab") - Drop the static path configuration for the Sphinx docs (Jeremy Cline) - Sign off generated configuration patches (Jeremy Cline) - Use __make macro instead of make (Tom Stellard) - redhat/configs: Enable CONFIG_SMC91X and disable CONFIG_SMC911X (Prarit Bhargava) [http://bugzilla.redhat.com/1722136] Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-acpi-prefer-booting-with-ACPI-over-DTS.patch')
-rw-r--r--0001-acpi-prefer-booting-with-ACPI-over-DTS.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
index e188b5a2d..48c4e0620 100644
--- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
+++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
@@ -39,10 +39,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
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
+index 46ec402e97ed..be65df48588f 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 */
+@@ -40,7 +40,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */
EXPORT_SYMBOL(acpi_pci_disabled);
static bool param_acpi_off __initdata;