From: Benjamin Herrenschmidt <benh@kernel•crashing.org>
To: Rob Herring <robherring2@gmail•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm•com>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: linux-next: manual merge of the dt-rh tree with the powerpc tree
Date: Sat, 02 Nov 2013 10:13:06 +1100 [thread overview]
Message-ID: <1383347586.4776.0.camel@pasglop> (raw)
In-Reply-To: <52742A2A.9080008@gmail.com>
On Fri, 2013-11-01 at 17:24 -0500, Rob Herring wrote:
> On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
> > Hi Rob,
> >
> > Today's linux-next merge of the dt-rh tree got a conflict in
> > arch/powerpc/include/asm/prom.h between commit a3e31b458844 ("of:
> > Move definition of of_find_next_cache_node into common code") from
> > the powerpc tree and commit 0c3f061c195c ("of: implement
> > of_node_to_nid as a weak function") from the dt-rh tree.
>
> Ben, I can pick these 2 patches up instead if you want to drop them
> and avoid the conflict.
I'd rather not rebase my tree, the conflict seems to be rather trivial
to solve.
Cheers,
Ben.
prev parent reply other threads:[~2013-11-01 23:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 5:20 linux-next: manual merge of the dt-rh tree with the powerpc tree Stephen Rothwell
2013-11-01 22:24 ` Rob Herring
2013-11-01 22:27 ` Stephen Rothwell
2013-11-01 23:13 ` Benjamin Herrenschmidt [this message]
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=1383347586.4776.0.camel@pasglop \
--to=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=robherring2@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sudeep.karkadanagesha@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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