diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
| commit | 17af4ec052a4e628ec6142e19398fdfabb4206e8 (patch) | |
| tree | f8d0953c9460749b598e30a56c3bb325dfc6aeb9 /0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch | |
| parent | 168917328214e94a54dbd4ef227dab46029b8134 (diff) | |
| parent | e9f1331084c27ee3ba0be15c1e5c9eae4b15a6cb (diff) | |
| download | kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc31.tar.gz kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc31.tar.xz kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200611gitb29482fde649.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 924c6cd47..eea0deea2 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 4da23e751bce..fdbf9106be4a 100644 +index 8777faced51a..2e60d792005f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1562,6 +1562,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1572,6 +1572,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; |