Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754760AbXEGSkz (ORCPT ); Mon, 7 May 2007 14:40:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754666AbXEGSky (ORCPT ); Mon, 7 May 2007 14:40:54 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:49851 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754096AbXEGSky (ORCPT ); Mon, 7 May 2007 14:40:54 -0400 Date: Mon, 7 May 2007 20:40:47 +0200 From: Ingo Molnar To: James Cloos Cc: linux-kernel@vger.kernel.org Subject: Re: [patch] CFS scheduler, -v10 Message-ID: <20070507184047.GA24430@elte.hu> References: <20070507163342.GA3502@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.2i X-ELTE-VirusStatus: clean 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.1.7 -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 536 Lines: 15 * James Cloos wrote: > If instead of pulling master into the cfs branch, I rather switch to > the master branch and pull the cfs branch into that, it works. ah! Could you please do a git-diff between the broken and the working tree, to see what got mismerged? Ingo - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/