From 424839b9c69d0380b65a338e105f91e4d2e44b43 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 29 Mar 2021 10:06:58 -0500 Subject: kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178 * Fri Mar 26 2021 Fedora Kernel Team [5.12.0-0.rc4.20210326gitdb24726bfefa.178] - New configs in fs/pstore (CKI@GitLab) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.12.0-redhat.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patch-5.12.0-redhat.patch') diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 58c257861..7df19e84b 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -138,7 +138,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index d4784d181123..ba1efc2609e3 100644 +index 73add16f9898..892e60ae6d18 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -467,10 +467,10 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index a184529d8fa4..2fd597d400dd 100644 +index 84bb7c1929f1..2e588a4178ef 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1616,6 +1616,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1639,6 +1639,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; -- cgit