From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the devicetree tree with the powerpc tree
Date: Mon, 27 Feb 2012 21:38:43 -0700 [thread overview]
Message-ID: <CACxGe6sLLxUL4U3fP6dOSOu+tYaMZkG6z7RWHqp-CX06Ztp1CQ@mail.gmail.com> (raw)
In-Reply-To: <20120228130634.3c511b096bc78f9b99e804fe@canb.auug.org.au>
On Mon, Feb 27, 2012 at 7:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46
> ("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig
> files") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile
> OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree tree.
>
> The former commit removes the file (as the legacy iSeries platform is
> being removed), so I did that.
Okay, thanks.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
next prev parent reply other threads:[~2012-02-28 4:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 2:06 linux-next: manual merge of the devicetree tree with the powerpc tree Stephen Rothwell
2012-02-28 4:38 ` Grant Likely [this message]
2012-03-13 5:01 Stephen Rothwell
2012-03-13 18:26 ` Grant Likely
2012-03-14 1:53 ` Gavin Shan
2012-03-14 8:29 ` Benjamin Herrenschmidt
2012-03-14 9:02 ` Gavin Shan
2021-02-18 3:48 Stephen Rothwell
2021-02-18 10:44 ` Michael Ellerman
2021-02-18 11:34 ` Stephen Rothwell
2021-02-18 13:52 ` Rob Herring
2021-02-18 20:31 ` Stephen Rothwell
2021-02-18 23:28 ` Michael Ellerman
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=CACxGe6sLLxUL4U3fP6dOSOu+tYaMZkG6z7RWHqp-CX06Ztp1CQ@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--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).