* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 -- 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