From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1758532AbYD2MG0@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758532AbYD2MG0 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 29 Apr 2008 08:06:26 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754486AbYD2MGT
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 29 Apr 2008 08:06:19 -0400
Received: from pentafluge.infradead.org ([213.146.154.40]:56857 "EHLO
	pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754373AbYD2MGS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 29 Apr 2008 08:06:18 -0400
Subject: Re: conflicted merge for sched-devel?
From: Peter Zijlstra <peterz@infradead.org>
To: Peter Teoh <htmldeveloper@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>
In-Reply-To: <804dabb00804290447jd80b1bdp798b823a6cb10b62@mail.gmail.com>
References: <804dabb00804290447jd80b1bdp798b823a6cb10b62@mail.gmail.com>
Content-Type: text/plain
Date: Tue, 29 Apr 2008 14:06:18 +0200
Message-Id: <1209470778.13978.56.camel@twins>
Mime-Version: 1.0
X-Mailer: Evolution 2.22.0 
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 2008-04-29 at 19:47 +0800, Peter Teoh wrote:
> This morning (about 11 hours ago) I did a git pull in sched-devel
> today and got a problem:

sched-devel is constantly rebased, don't pull.