From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>,
Peter De Schrijver <pdeschrijver@nvidia.com>,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Mon, 18 Mar 2013 15:49:56 +0000 [thread overview]
Message-ID: <201303181549.57080.arnd@arndb.de> (raw)
In-Reply-To: <51473179.2030306@wwwdotorg.org>
On Monday 18 March 2013, Stephen Warren wrote:
> On 03/17/2013 10:31 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tegra tree got a conflict in
> > drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba
> > ("clocksource: tegra20: use the device_node pointer passed to
> > init") from the arm-soc tree and commit 6f88fb8af6c6 ("clocksource:
> > tegra: move to of_clk_get") from the tegra tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no
> > action is required).
>
> Thanks. This resolution looks fine.
>
> Arnd/Olof, do you want me to rebase the Tegra branch onto some arm-soc
> branch to resolve this conflict, or are you happy to simply resolve it
> as below when pulling the Tegra branches into arm-soc for 3.10?
No need to rebase. We can resolve this by merging the clksrc/cleanup
into your branch when we pull it, or you can merge it yourself.
Arnd
next prev parent reply other threads:[~2013-03-18 15:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 4:31 linux-next: manual merge of the tegra tree with the arm-soc tree Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 23:04 Stephen Rothwell
2020-03-26 22:27 Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50 ` Arnd Bergmann
2019-06-25 0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-02-02 11:52 Stephen Rothwell
2013-02-02 11:45 Stephen Rothwell
2013-01-23 5:30 Stephen Rothwell
2013-01-23 5:25 Stephen Rothwell
2013-01-16 3:14 Stephen Rothwell
2013-01-16 3:49 ` Tony Prisk
2013-01-16 4:32 ` Stephen Warren
2013-01-16 4:52 ` Tony Prisk
2013-01-16 16:27 ` Olof Johansson
2013-01-16 17:08 ` Stephen Warren
2013-01-16 17:35 ` Olof Johansson
2013-01-16 3:10 Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
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=201303181549.57080.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=ccross@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pdeschrijver@nvidia.com \
--cc=rob.herring@calxeda.com \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.com \
--cc=swarren@wwwdotorg.org \
/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).