Re: linux-next: build failure after merge of the pm tree

Rafael J. Wysocki
2013-12-18T01:04:27Z

[-- Attachment #1: Type: text/plain, Size: 654 bytes --]

On Wednesday, December 18, 2013 12:00:26 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/acpi/nvs.c:15:27: fatal error: linux/acpi_io.h: No such file or directory
> #include <linux/acpi_io.h>
> ^
>
> Caused by commit a99493647c1a ("Merge branch 'acpi-cleanup' into
> linux-next") which incorrectly reintroduced the include of
> linux/acpi_io.h.
>
> I have used the pm tree from next-20131217 for today.

Sorry for the breakage, I messed up a conflict resolution. It should be
fixed now in my tree FWIW.

Thanks,
Rafael

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]