Hi Len, Today's linux-next merge of the acpi tree got a conflict in drivers/acpi/processor_idle.c between commit 4f8429166818 ("ACPICA: Cleanup PM_TIMER_FREQUENCY definition") from the pm tree and commit 41cdb0efc42e ("ACPI / idle: remove unused definition") from the acpi tree. I fixed it up (The latter removed the lines modified by the former, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpYMekUU9_tv.pgp
Description: PGP signature