Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751856AbaGGIWu (ORCPT ); Mon, 7 Jul 2014 04:22:50 -0400 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:56883 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750855AbaGGIWt (ORCPT ); Mon, 7 Jul 2014 04:22:49 -0400 Date: Mon, 7 Jul 2014 09:22:36 +0100 From: Russell King - ARM Linux To: Stephen Rothwell Cc: Jason Cooper , andrew@lunn.ch, gregory.clement@free-electrons.com, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni Subject: Re: linux-next: manual merge of the mvebu tree with the arm tree Message-ID: <20140707082236.GX21766@n2100.arm.linux.org.uk> References: <20140707112853.7f5a9323@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140707112853.7f5a9323@canb.auug.org.au> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 07, 2014 at 11:28:53AM +1000, Stephen Rothwell wrote: > diff --cc arch/arm/mach-mvebu/headsmp-a9.S > index 7c91ddb6f1f7,da5bb292b91c..000000000000 > --- a/arch/arm/mach-mvebu/headsmp-a9.S > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > @@@ -14,8 -14,9 +14,10 @@@ > > #include > #include > +#include > > + #include > + Obviously not quite correct - this looks like an automatic merge, something that will have to be kept an eye on during the proper merge window. -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from 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/