lkml.org 
[lkml]   [2018]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: 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

    \
     
     \ /
      Last update: 2018-03-24 09:16    [W:3.035 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site