Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755871Ab0HDQKM (ORCPT ); Wed, 4 Aug 2010 12:10:12 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53232 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313Ab0HDQKJ convert rfc822-to-8bit (ORCPT ); Wed, 4 Aug 2010 12:10:09 -0400 From: "Nori, Sekhar" To: Stephen Rothwell , Kevin Hilman CC: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Date: Wed, 4 Aug 2010 21:39:51 +0530 Subject: RE: linux-next: manual merge of the davinci tree with Linus' tree Thread-Topic: linux-next: manual merge of the davinci tree with Linus' tree Thread-Index: Acsyrguxk8hxm2ZfQxq9aZfcsf4CcQBQSSIg Message-ID: References: <20100803114853.27a29365.sfr@canb.auug.org.au> In-Reply-To: <20100803114853.27a29365.sfr@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 933 Lines: 26 Hi Stephen, On Tue, Aug 03, 2010 at 07:18:53, Stephen Rothwell wrote: > Hi Kevin, > > Today's linux-next merge of the davinci tree got a conflict in > arch/arm/mach-davinci/board-da850-evm.c between commit > 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm: > account for DEFDCDC{2,3} being tied high") from Linus' tree and commit > ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse > cleanup: make file local variables static") from the davinci tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while. Thanks for fixing this. Kevin is on a vacation. There would be a delayed response. Regards, Sekhar -- 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/