From: Tony Lindgren <tony@atomide.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"Guruswamy, Senthilvadivu" <svadivu@ti.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree
Date: Thu, 24 Feb 2011 13:23:39 -0800 [thread overview]
Message-ID: <20110224212339.GM20560@atomide.com> (raw)
In-Reply-To: <1298278062.4931.19.camel@deskari>
Hi,
* Tomi Valkeinen <tomi.valkeinen@ti.com> [110221 00:46]:
>
> Tony, do you have such a semi-stable branch I could use as a base? Or
> any other ideas?
I guess you already figured this out.. The omap-for-linus branch should
have immutable commits. So you can merge with the earliest commit that
does the job for you from there.
Regards,
Tony
next prev parent reply other threads:[~2011-02-24 21:23 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 3:16 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2011-02-21 3:16 ` Stephen Rothwell
2011-02-21 8:47 ` Tomi Valkeinen
2011-02-24 21:23 ` Tony Lindgren [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-18 2:25 Stephen Rothwell
2011-02-18 2:25 ` Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 ` Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 ` Stephen Rothwell
2010-05-07 3:43 Stephen Rothwell
2010-05-07 3:43 ` Stephen Rothwell
2010-05-10 20:20 ` Tony Lindgren
2010-05-12 8:59 ` Tomi Valkeinen
2010-05-14 19:09 ` Tony Lindgren
2010-05-17 7:07 ` Tomi Valkeinen
2010-03-11 4:18 Stephen Rothwell
2010-03-11 16:53 ` Tony Lindgren
2010-03-11 22:18 ` Stephen Rothwell
2010-02-08 6:25 Stephen Rothwell
2010-02-08 6:25 ` Stephen Rothwell
2010-02-08 9:29 ` Tomi Valkeinen
2010-02-08 10:57 ` Stephen Rothwell
2010-02-08 11:43 ` Tomi Valkeinen
2010-02-09 16:52 ` Tony Lindgren
2010-02-10 8:20 ` Tomi Valkeinen
2010-02-10 9:52 ` Hiremath, Vaibhav
2010-02-03 4:29 Stephen Rothwell
2010-02-03 4:29 ` Stephen Rothwell
2010-02-03 12:29 ` Grazvydas Ignotas
2010-02-03 17:12 ` Tony Lindgren
2010-02-04 9:42 ` Tomi Valkeinen
2009-12-09 3:59 Stephen Rothwell
2009-11-16 5:04 Stephen Rothwell
2009-11-16 5:04 ` Stephen Rothwell
2009-11-16 10:06 ` Tomi Valkeinen
2009-11-16 18:34 ` Tony Lindgren
2009-11-17 10:00 ` Tomi Valkeinen
2009-11-17 23:49 ` Stephen Rothwell
2009-11-17 3:08 ` Sid Boyce
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=20110224212339.GM20560@atomide.com \
--to=tony@atomide.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=svadivu@ti.com \
--cc=tomi.valkeinen@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.