Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in MAINTAINERS
between commit 15fd830dd310 ("MAINTAINERS: Add ACPI folks for
ACPI-related things under drivers/pci") from the pci tree and commit
994b942fb4eb ("ACPI: Update MAINTAINERS file to include
Documentation/acpi") from the pm tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc MAINTAINERS index 6f30491,04a5fef..0000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -247,9 -242,8 +247,11 @@@ F: drivers/acpi F: drivers/pnp/pnpacpi/ F: include/linux/acpi.h F: include/acpi/ +F: drivers/pci/*acpi* +F: drivers/pci/*/*acpi* +F: drivers/pci/*/*/*acpi* + F: Documentation/acpi + F: Documentation/ABI/testing/sysfs-bus-acpi ACPI FAN DRIVER M: Zhang Rui <rui.zh...@intel.com>
pgpCYvEe2lwZJ.pgp
Description: PGP signature
