From: Simon Horman <horms@verge.net.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org, Magnus Damm <damm@opensource.se>,
linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the renesas tree with Linus' tree
Date: Thu, 16 May 2013 14:04:53 +0900 [thread overview]
Message-ID: <20130516050450.GA13842@verge.net.au> (raw)
In-Reply-To: <20130516132253.8865ca7b6503bd6fe9e6b05a@canb.auug.org.au>
On Thu, May 16, 2013 at 01:22:53PM +1000, Stephen Rothwell wrote:
> Hi Simon,
>
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/mach-shmobile/board-lager.c between commit 65be2de17aae ("ARM:
> shmobile: use r8a7790 timer setup code on Lager") from Linus' tree and
> commit 993340a1390d ("ARM: shmobile: use r8a7790 timer setup code on
> Lager") from the renesas tree.
>
> These are the same patch but different commits :-( and there are further
> commits touching this file in the renesas tree. Please clean up your
> tree and remove anything that has already gone upstream as different
> patches. I used the renesas tree version of this file.
Sorry about that. I am working on re-basing my branches on
top of v3.10-rc1 and I have confirmed that in my current local
branches the problem you describe is no longer present.
I plan to push the refreshed branches, including a new next branch
for linux-next, once a few bug-fix patches have been reviewed.
next prev parent reply other threads:[~2013-05-16 5:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 3:22 linux-next: manual merge of the renesas tree with Linus' tree Stephen Rothwell
2013-05-16 5:04 ` Simon Horman [this message]
2013-05-16 6:12 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-03-12 3:07 Stephen Rothwell
2013-02-27 1:17 Stephen Rothwell
2013-02-27 1:27 ` Simon Horman
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=20130516050450.GA13842@verge.net.au \
--to=horms@verge.net.au \
--cc=arnd@arndb.de \
--cc=damm@opensource.se \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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).