From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757714Ab2C0D36 (ORCPT ); Mon, 26 Mar 2012 23:29:58 -0400 Received: from void.printf.net ([89.145.121.20]:57473 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757609Ab2C0D3z (ORCPT ); Mon, 26 Mar 2012 23:29:55 -0400 From: Chris Ball To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kukjin Kim , Linus Subject: Re: linux-next: manual merge of the mmc tree with the s5p tree References: <20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au> Date: Mon, 26 Mar 2012 23:29:47 -0400 In-Reply-To: <20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 27 Mar 2012 14:10:33 +1100") Message-ID: <87haxayb4k.fsf@laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Mon, Mar 26 2012, Stephen Rothwell wrote: > This conflict has been caused in part because you rebased your tree and > copied some commits that used to be merged into your tree from a shared > branch. Do *not* do that ... BTW, when you rebased those commits into > your tree, you did not sign them either. This is exactly what Linus has > just berated one of the other maintainers for ... Ugh, I'm sorry for screwing this up. > I am not fixing this conflict, I am just using the version of your tree > that I have from next-20120326. Please fix your tree up properly. I've reverted to the version in next-20120326 too, and will avoid rebasing. Thanks, - Chris. -- Chris Ball One Laptop Per Child