diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-18 18:27:10 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-18 18:27:10 +0100 |
| commit | 5ebc36af11140661b24fe257cd9a216d3a96ba40 (patch) | |
| tree | 196c68140fddd00a57315ed14516be668ed392de /patch-5.17-redhat.patch | |
| parent | 503b31920a07d916c98309c1b6a2792170334db4 (diff) | |
| parent | a2b528f09e9d7b9e0af803e8d6bc715a143ead38 (diff) | |
| download | kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc36.tar.gz kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc36.tar.xz kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc36.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc37kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc36kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc35kernel-5.17.0-0.rc8.20220318git551acdc3c3d2.125.vanilla.1.fc34
Diffstat (limited to 'patch-5.17-redhat.patch')
| -rw-r--r-- | patch-5.17-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index e93144f31..f4590fd89 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -547,7 +547,7 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 1331756d4cfc..4b5257f5e2c4 100644 +index 8b2e5ef15559..ac0291ef0838 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1769,6 +1769,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -852,7 +852,7 @@ index c02ff25dd477..d860f8eb9a81 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 7de3f5b6e8d0..95b1c35b347c 100644 +index 5502e176d51b..93b61ca552d6 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ |