From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-omap@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the omap tree with the arm tree
Date: Thu, 4 Feb 2010 20:04:44 -0800 [thread overview]
Message-ID: <20100205040444.GH22747@atomide.com> (raw)
In-Reply-To: <20100205111617.c602983f.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [100204 16:13]:
> Hi Tony,
>
> On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren <tony@atomide.com> wrote:
> >
> > Thanks, I'll sort it out in omap for-next tree so they merge
> > cleanly.
Tried figuring out a clean mergeable solution, but it looks like
I need to manually merge or rebase the omap patches with patch
"ARM: 5910/1: ARM: Add tmp register for addruart and loadsp".
If we move the related debug-macro.S changes from omap tree to
Russell's tree, then I can't build my following multi-omap
patches..
Russell, can you please let me know if you have some static
commit ID containing the patch above that I could use that as
base for my patches?
Regards,
Tony
next prev parent reply other threads:[~2010-02-05 4:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-04 23:20 linux-next: manual merge of the omap tree with the arm tree Stephen Rothwell
2010-02-04 23:30 ` Tony Lindgren
2010-02-05 0:16 ` Stephen Rothwell
2010-02-05 4:04 ` Tony Lindgren [this message]
2010-02-15 15:03 ` Russell King
2010-02-17 19:33 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2010-12-26 22:41 Stephen Rothwell
2010-07-08 1:37 Stephen Rothwell
2010-07-08 10:14 ` Tony Lindgren
2010-07-04 23:20 Stephen Rothwell
2010-07-05 1:46 ` Nicolas Pitre
2010-07-05 7:14 ` Stephen Rothwell
2010-07-05 13:44 ` Tony Lindgren
2009-08-19 5:04 Stephen Rothwell
2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-20 13:55 ` Tony Lindgren
2009-08-24 13:07 ` Tony Lindgren
2009-08-24 13:14 ` Stephen Rothwell
2009-05-28 4:31 Stephen Rothwell
2009-05-28 6:25 ` Shilimkar, Santosh
2009-05-28 6:34 ` Stephen Rothwell
2009-05-28 6:40 ` Shilimkar, Santosh
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=20100205040444.GH22747@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=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).