Messages in this thread | | | Date | Fri, 23 Mar 2018 07:09:24 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with the pm tree |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > kernel/sched/cpufreq_schedutil.c > > between commit: > > 0953feed3400 ("cpufreq: schedutil: rate limits for SCHED_DEADLINE")
Rafael, could you please send that to the scheduler tree?
Thanks,
Ingo
| |