On Friday, March 11, 2016 12:57:46 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/sched.h
>
> between commit:
>
> adaf9fcd1369 ("cpufreq: Move scheduler-related code to the sched directory")
>
> from the pm tree and commit:
>
> e9532e69b8d1 ("sched/cputime: Fix steal time accounting vs. CPU hotplug")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks!
Rafael
--
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
