Messages in this thread | | | Date | Tue, 15 Mar 2016 12:55:36 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the pm tree |
| |
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
| |