Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/power/x86/turbostat/turbostat.c
between commit:
58cc30a4e608 ("tools/power turbostat: fix compiler warnings")
from the pm tree and commit:
1b69317d2dc8 ("tools/power turbostat: fix various build warnings")
from the tip tree.
I fixed it up (I arbitrarily used the pm tree version) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
