From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752477Ab1LSIKQ (ORCPT ); Mon, 19 Dec 2011 03:10:16 -0500 Received: from mx2.mail.elte.hu ([157.181.151.9]:34442 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501Ab1LSIKM (ORCPT ); Mon, 19 Dec 2011 03:10:12 -0500 Date: Mon, 19 Dec 2011 09:08:13 +0100 From: Ingo Molnar To: Stephen Rothwell Cc: Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Glauber Costa , Martin Schwidefsky Subject: Re: linux-next: manual merge of the tip tree with the cputime tree Message-ID: <20111219080813.GB30432@elte.hu> References: <20111219154010.c2044c038a6174dd8fb6f477@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111219154010.c2044c038a6174dd8fb6f477@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * 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 ... 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