Messages in this thread | | | Date | Sat, 24 Mar 2018 09:15:49 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with the pm tree |
| |
* Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> On Friday, March 23, 2018 7:09:24 AM CET Ingo Molnar wrote: > > > > * 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? > > You can apply from > > https://patchwork.kernel.org/patch/10278127/ > > and I will drop it from my tree. > > Thanks!
Great - Thomas picked it up and it's now in tip:sched/core:
e97a90f7069b: sched/cpufreq: Rate limits for SCHED_DEADLINE
and it should hit -next on Monday.
Thanks,
Ingo
| |