Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757479Ab0BCRMI (ORCPT ); Wed, 3 Feb 2010 12:12:08 -0500 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:56447 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757466Ab0BCRMF (ORCPT ); Wed, 3 Feb 2010 12:12:05 -0500 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 72.249.23.125 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX187Tw+7+/Fi3T61lrrJb6Nv Date: Wed, 3 Feb 2010 09:12:28 -0800 From: Tony Lindgren To: Grazvydas Ignotas Cc: Stephen Rothwell , Tomi Valkeinen , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Adrian Hunter , linux-omap@vger.kernel.org Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree Message-ID: <20100203171227.GD22747@atomide.com> References: <20100203152947.f4955d91.sfr@canb.auug.org.au> <6ed0b2681002030429t1f6b33e9r3b6ea667fffb0f6a@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6ed0b2681002030429t1f6b33e9r3b6ea667fffb0f6a@mail.gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1407 Lines: 34 * 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? Regards, Tony -- 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/