From: Grant Likely <grant.likely@secretlab.ca>
To: Olof Johansson <olof@lixom.net>, Mark Brown <broonie@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Arnd Bergmann <arnd@arndb.de>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Thu, 13 Mar 2014 12:55:21 +0000 [thread overview]
Message-ID: <20140313125521.19449C41038@trevor.secretlab.ca> (raw)
In-Reply-To: <CAOesGMiK-8_0vt7jWSMT3oaoPUz5fS92ztknC-HhsEYt2XCNZQ@mail.gmail.com>
On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson <olof@lixom.net> wrote:
> On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown <broonie@kernel.org> wrote:
> > Hi Grant,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and commit f618c4703a14672d27 ("drivers: of: add support for custom reserved memory drivers") from the devicetree tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> LGTM from the arm-soc side.
Ditto
g.
>
>
> -Olof
next prev parent reply other threads:[~2014-03-13 12:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 22:03 linux-next: manual merge of the devicetree tree with the arm-soc tree Mark Brown
2014-03-12 22:36 ` Olof Johansson
2014-03-13 12:55 ` Grant Likely [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-22 6:03 Stephen Rothwell
2020-05-22 8:08 ` Arnd Bergmann
2019-11-14 2:21 Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell
2017-11-09 2:26 Stephen Rothwell
2017-11-09 2:21 Stephen Rothwell
2016-06-27 3:42 Stephen Rothwell
2014-01-17 3:14 Stephen Rothwell
2014-01-17 3:11 Stephen Rothwell
2014-01-17 3:08 Stephen Rothwell
2014-01-17 4:35 ` Jason Cooper
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=20140313125521.19449C41038@trevor.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=olof@lixom.net \
--cc=sboyd@codeaurora.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).