[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the tip tree with the cputime tree

    * Stephen Rothwell <> wrote:

    > Hi all,
    > Today's linux-next merge of the tip tree got a conflict in
    > fs/proc/uptime.c between commit c3e0ef9a298e ("[S390] fix cputime
    > overflow in uptime_proc_show") from the cputime tree and commit
    > 3292beb340c7 ("sched/accounting: Change cpustat fields to an array") from
    > the tip tree.
    > I fixed it up (I think - see below) and can carry the fix as necessary.
    > Generally, you guys seem to be working a little at cross purposes ...


    Martin, could you please send Peter and me a pull request of the
    current cputime bits merged on top of tip:sched/core? Those bits
    should go upstream via the scheduler tree.



     \ /
      Last update: 2011-12-19 09:13    [W:0.021 / U:1.204 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site