Merge back 'acpi-scan' changes for v5.12.