From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Tobias Schandinat Subject: Re: [GIT PULL] OMAP DSS for v3.4 Date: Thu, 22 Mar 2012 15:51:28 +0000 Message-ID: <4F6B4A80.309@gmx.de> References: <1332154865.2144.57.camel@deskari> <201203191624.42020.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout-de.gmx.net ([213.165.64.22]:40294 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S965045Ab2CVPvy (ORCPT ); Thu, 22 Mar 2012 11:51:54 -0400 In-Reply-To: <201203191624.42020.arnd@arndb.de> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Arnd Bergmann Cc: Tomi Valkeinen , linux-omap@vger.kernel.org, linux-fbdev Arnd, On 03/19/2012 04:24 PM, Arnd Bergmann wrote: > I've looked at the specific conflicts again, and it seems that the only > conflicting commit in arm-soc is 2e3ee9f45b "ARM: OMAP1: Move most of > plat/io.h into local iomap.h". I'm planning to send that one very early, > as soon as Russell has his first set up patches merged, so I don't > actually have to resolve the conflict here unless Florian is also > there early. just for your info, I am going to send my pull request today. As I didn't find any pull request from you until now, I didn't pull any of the branches below. Best regards, Florian Tobias Schandinat > > Florian, if I end up being faster than you, feel free to pull the > omap/cleanup branch from git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git > if you want to get a conflict resolution using the minimum set of patches > from upstream. Alternatively, pulling "cleanup" from > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap should give you > the same. > > Arnd > -- > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >