Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/apic/io_apic.c between commit 16394fd03114 ("x86 / PM:
Replace CONFIG_PM_RUNTIME in io_apic.c") from the pm tree and various
commits from the tip tree.I fixed it up (the tip tree seems to have made extensive changes to this file and there are no longer any references to CONFIG_PM_RUNTIME, so I used the tip tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgpf2yS2rfLBb.pgp
Description: OpenPGP digital signature
