From: Rob Herring <robherring2@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the dt-rh tree with the powerpc tree
Date: Fri, 01 Nov 2013 17:24:42 -0500 [thread overview]
Message-ID: <52742A2A.9080008@gmail.com> (raw)
In-Reply-To: <20131101162002.4dd386299ec42e8d8d032be2@canb.auug.org.au>
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.
Rob
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robherring2@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the dt-rh tree with the powerpc tree
Date: Fri, 01 Nov 2013 17:24:42 -0500 [thread overview]
Message-ID: <52742A2A.9080008@gmail.com> (raw)
In-Reply-To: <20131101162002.4dd386299ec42e8d8d032be2@canb.auug.org.au>
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.
Rob
next prev parent reply other threads:[~2013-11-01 22:24 UTC|newest]
Thread overview: 9+ 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 5:20 ` Stephen Rothwell
2013-11-01 5:20 ` Stephen Rothwell
2013-11-01 22:24 ` Rob Herring [this message]
2013-11-01 22:24 ` Rob Herring
2013-11-01 22:27 ` Stephen Rothwell
2013-11-01 22:27 ` Stephen Rothwell
2013-11-01 23:13 ` Benjamin Herrenschmidt
2013-11-01 23:13 ` Benjamin Herrenschmidt
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=52742A2A.9080008@gmail.com \
--to=robherring2@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sfr@canb.auug.org.au \
--cc=sudeep.karkadanagesha@arm.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.