From: Arnd Bergmann <arnd@arndb.de>
To: Archit Taneja <archit@ti.com>
Cc: Tony Lindgren <tony@atomide.com>,
"Valkeinen, Tomi" <tomi.valkeinen@ti.com>,
Paul Walmsley <paul@pwsan.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: conflicts between omap/cleanup branch and omap_dss2 tree
Date: Tue, 19 Jul 2011 14:59:44 +0200 [thread overview]
Message-ID: <201107191459.44992.arnd@arndb.de> (raw)
In-Reply-To: <4E25784D.8070300@ti.com>
On Tuesday 19 July 2011, Archit Taneja wrote:
> Tomi is on vacation right now, but he checks his mail once in a while,
> so we may get a response soon.
>
> Tomi's for-next branch is not up to date yet. So it shouldn't be
> considered for now. The HWMOD patches in Tomi's for-next branch will be
> pushed by Paul as 3.1-rc fixes.
>
> We will make a temporary branch which will contain all the DSS2 patches
> which Tomi intended to push for this merge window, once he gets a
> chance, he can quickly update his for-next branch with it.
Ok, just let me know when you upload that branch so I can remove the
dependency from the arm-soc tree. Right now, I'm pulling the
omap_dss2/for_next branch into arm-soc/for_next as a dependency
to resolve the conflict.
Arnd
next prev parent reply other threads:[~2011-07-19 12:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 21:39 conflicts between omap/cleanup branch and omap_dss2 tree Arnd Bergmann
2011-07-18 8:08 ` Tony Lindgren
2011-07-19 12:27 ` Archit Taneja
2011-07-19 12:59 ` Arnd Bergmann [this message]
2011-07-21 7:19 ` Tomi Valkeinen
2011-07-21 14:20 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201107191459.44992.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=archit@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox