Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the tip tree with the pm tree | Date | Fri, 23 Mar 2018 22:09:20 +0100 |
| |
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!
| |