From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740Ab1LSL1x (ORCPT ); Mon, 19 Dec 2011 06:27:53 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:49435 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752364Ab1LSL1s (ORCPT ); Mon, 19 Dec 2011 06:27:48 -0500 Date: Mon, 19 Dec 2011 12:25:47 +0100 From: Ingo Molnar To: Martin Schwidefsky Cc: Stephen Rothwell , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Glauber Costa Subject: Re: linux-next: manual merge of the tip tree with the cputime tree Message-ID: <20111219112547.GA32375@elte.hu> References: <20111219154010.c2044c038a6174dd8fb6f477@canb.auug.org.au> <20111219080813.GB30432@elte.hu> <20111219101134.3c2c0db5@de.ibm.com> <20111219103513.GA17928@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111219103513.GA17928@elte.hu> 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=AWL,BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 AWL AWL: From: address is in the auto white-list Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > All of it including "[S390] cputime: add sparse checking and > > cleanup" or just the fix for uptime ? > > I suspect we can take it all if it's all scheduling/time > related, and add new patches to sched/core to keep it all > concentrated in a single tree? Btw., i'd suggest to keep your commits as-is and merge tip:sched/core into your tree - and send the result to me so that we can make that the new sched/core. That way your commits are preserved and the conflicts are resolved. Thanks, Ingo