From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Paul Walmsley <paul@pwsan.com>, Tony Lindgren <tony@atomide.com>,
Archit Taneja <archit@ti.com>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: conflicts between omap/cleanup branch and omap_dss2 tree
Date: Thu, 21 Jul 2011 10:19:44 +0300 [thread overview]
Message-ID: <1311232784.1874.3.camel@deskari> (raw)
In-Reply-To: <201107191459.44992.arnd@arndb.de>
On Tue, 2011-07-19 at 14:59 +0200, Arnd Bergmann wrote:
> 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.
I've pushed a new for-next branch to
git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
decided to just reset it to -rc4 for now.
The latest DSS code does not work without bunch of HWMOD/omap_device
patches so I'm not sure if there's any point to push the code to
linux-next which, afaik, does not currently have those HWMOD/omap_device
patches (Paul, correct me if I'm wrong).
Tomi
next prev parent reply other threads:[~2011-07-21 7:19 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
2011-07-21 7:19 ` Tomi Valkeinen [this message]
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=1311232784.1874.3.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=archit@ti.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=sfr@canb.auug.org.au \
--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