Re: linux-next: manual merge of the mfd tree with the pm tree

> Hi Lee, Morning Stephen. > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/acpi/scan.c > > between commit: > > 68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c") > > from the pm tree and commit: > > 712e960f0ee9 ("ACPI / PM: Attach ACPI power dom

linux-next: manual merge of the mfd tree with the pm tree

Hi Lee, Today's linux-next merge of the mfd tree got a conflict in: drivers/acpi/scan.c between commit: 68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c") from the pm tree and commit: 712e960f0ee9 ("ACPI / PM: Attach ACPI power domain only once") from the mfd tree. I fix