Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753226Ab2JBSvV (ORCPT ); Tue, 2 Oct 2012 14:51:21 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:45904 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443Ab2JBSvU (ORCPT ); Tue, 2 Oct 2012 14:51:20 -0400 MIME-Version: 1.0 In-Reply-To: References: Date: Tue, 2 Oct 2012 14:51:19 -0400 X-Google-Sender-Auth: H2o8dullfBLSkNXiLKMs9X_pMUE Message-ID: Subject: Re: [PATCH] xen: resolve merge conflict with 617276307cd4cdb9a95c77efaa3063695af63aa7 From: Konrad Rzeszutek Wilk To: Stefano Stabellini Cc: Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xensource.com, Stephen Rothwell , linux-next@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 938 Lines: 26 On Tue, Oct 2, 2012 at 1:29 PM, Stefano Stabellini wrote: > The Xen tree tries to add a line to > arch/arm/mach-vexpress/Makefile.boot that has been removed by the > following commit in Linus' master: > > commit 617276307cd4cdb9a95c77efaa3063695af63aa7 > Author: Rob Herring > Date: Thu Sep 6 13:43:04 2012 -0500 > > ARM: vexpress: convert to multi-platform > > In fact the dts Makefile is now arch/arm/boot/dts/Makefile, as per > commit 9cd11c0c47b8690b47e7573311ce5c483cb344ed. > > > This is the merge resolution patch. > > Signed-off-by: Stefano Stabellini Great. Thanks for posting it! -- 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/