Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756311Ab0BDJkh (ORCPT ); Thu, 4 Feb 2010 04:40:37 -0500 Received: from smtp.nokia.com ([192.100.105.134]:47237 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753395Ab0BDJke (ORCPT ); Thu, 4 Feb 2010 04:40:34 -0500 Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree From: Tomi Valkeinen To: ext Tony Lindgren Cc: Grazvydas Ignotas , Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Hunter Adrian (Nokia-D/Helsinki)" , "linux-omap@vger.kernel.org" In-Reply-To: <20100203171227.GD22747@atomide.com> References: <20100203152947.f4955d91.sfr@canb.auug.org.au> <6ed0b2681002030429t1f6b33e9r3b6ea667fffb0f6a@mail.gmail.com> <20100203171227.GD22747@atomide.com> Content-Type: text/plain; charset="UTF-8" Organization: Nokia Date: Thu, 04 Feb 2010 11:42:55 +0200 Message-ID: <1265276575.17836.10.camel@tubuntu.research.nokia.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 04 Feb 2010 09:40:04.0206 (UTC) FILETIME=[0765E0E0:01CAA57E] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1564 Lines: 37 On Wed, 2010-02-03 at 18:12 +0100, ext Tony Lindgren wrote: > * Grazvydas Ignotas [100203 04:27]: > > hi, > > > > On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell wrote: > > > Hi Tomi, > > > > > > Today's linux-next merge of the omap_dss2 tree got a conflict in > > > arch/arm/mach-omap2/board-omap3pandora.c between commit > > > f8b6f704105164eac7c043a48f79c4234e03e4b2 ("omap: Rename hsmmc symbols to > > > reflect independence from twl4030") from the omap tree and commit > > > aacb4387a1e6f3b57977375532c6d8e47fcd5652 ("OMAP: pandora: add DSS2 > > > support and related regulators") from the omap_dss2 tree. > > > > I've rebased my patch against linux-omap/for-next (attached). To fix > > the conflict, Tomi can rebase his queue on linux-omap/for-next, or > > Tony can simply take this to his queue - this has no "hard" > > dependencies on other queued DSS2 changes, has only board file changes > > and builds fine in linux-omap/for-next. I would prefer the second > > option, as I plan sending more boardfile changes to linux-omap. > > Thanks Stephen and Grazvydas. > > This sounds good to me, I've added this patch into omap for-next. > > Tomi can you please drop the earlier version from your branch? Sounds good to me. I dropped the patch from my tree. Tomi -- 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/