diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
| commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
| tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch | |
| parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
| parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
| download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch')
| -rw-r--r-- | 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch index 1cd552bf4..924c6cd47 100644 --- a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch +++ b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch @@ -28,10 +28,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 9 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 5287ab98b8c1..3b5cc5f281c0 100644 +index 4da23e751bce..fdbf9106be4a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1563,6 +1563,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1562,6 +1562,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; |