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