From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: Re: linux-next: manual merge of the msm tree with the arm tree Date: Mon, 18 Oct 2010 09:15:20 +0100 Message-ID: <20101018081520.GA10551@flint.arm.linux.org.uk> References: <20101018103540.7bd9c535.sfr@canb.auug.org.au> <20101018110207.131b56ee.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:55057 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343Ab0JRIPp (ORCPT ); Mon, 18 Oct 2010 04:15:45 -0400 Content-Disposition: inline In-Reply-To: <20101018110207.131b56ee.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Daniel Walker , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jeremy Kerr , Jeff Ohlstein On Mon, Oct 18, 2010 at 11:02:07AM +1100, Stephen Rothwell wrote: > [ Just cc'ing Russell, sorry about that] > > On Mon, 18 Oct 2010 10:35:40 +1100 Stephen Rothwell wrote: > > > > Hi Daniel, > > > > Today's linux-next merge of the msm tree got a conflict in > > arch/arm/mach-msm/include/mach/debug-macro.S between commit > > 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and > > virtual addresses from addruart") from the arm tree and commit > > 46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be > > conditionally disabled") from the msm tree. > > > > Just context changes. I fixed it up (see below) and can carry the fix as > > necessary. Thanks, but I don't think there's much which can be done about these. Changes such as 08a610d affect all ARM sub-architectures, and as they're spread across multiple git trees... I think there's going to be some problems during this forthcoming merge window. -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: