On Mon, Nov 16, 2026 at 6:16 PM Uwe Kleine-König (The Capable Hub) <[email protected]> wrote: > > Hey Rafael, > > On Fri, Nov 13, 2026 at 05:17:30PM +0100, Rafael J. Wysocki (Intel) wrote: > > > Uwe Kleine-König (The Capable Hub) (4): > > > ACPI: Unify acpi_device_id list terminators > > > ACPI: Drop unused .driver_data initializers in acpi_device_id arrays > > > ACPI: Use named initializers for acpi_device_id arrays > > > ACPI: Unify *_device_id list terminators > > > > All patches applied as 7.5 material, thanks! > > While rebasing these patches (as part of my wip tree that contains a lot > more similar patches) to next-20261113 I hit some merge conflicts. If > you tell me where you applied it, I can take a look and provide my merge > conflict resolution to allow double checking.
I've rebased a couple of patches on some material merged previously. Please see https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=58d4ba8979133c41cd491dff1dab40626daa924a
