Hi all,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/platform/x86/intel/pmc/core.c
between commit:
5fa607880168 ("platform/x86:intel/pmc: Revert "Enable the ACPI PM Timer to be turned off when suspended"")
from Linus' tree and commit:
d7a87891e2f5 ("platform/x86:intel/pmc: fix build regression with pmtimer turned off")
from the clockevents tree.
I fixed it up (the former removes the code updated by the latter, so I
just used the former) and can carry the fix as necessary. This is now
fixed as far as linux-next is concerned, but any non trivial conflicts
should be mentioned to your upstream maintainer when your tree is
submitted for merging. You may also want to consider cooperating with
the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
Attachment:
pgpSADs5Yg9Nl.pgp
Description: OpenPGP digital signature
