From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Simon Horman <horms@verge.net.au>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Magnus Damm <damm+renesas@opensource.se>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Peter Robinson <pbrobinson@gmail.com>
Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Thu, 15 Jan 2015 09:44:24 +0100 [thread overview]
Message-ID: <CAMuHMdVjtVfTQyqMZYeXiPCMoeyxxUv-ikxRvM3uw9FCGTQ+BA@mail.gmail.com> (raw)
In-Reply-To: <20150115113840.71ab0a39@canb.auug.org.au>
On Thu, Jan 15, 2015 at 1:38 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> tree and commits 9ccba8abd0a7 ("ARM: shmobile: kzm9g: Build DTS for
> Multiplatform") and 93c9f0228a3d ("ARM: shmobile: kzm9g-reference:
> Remove board C code and DT file") from the renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Your resolution is correct.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2015-01-15 8:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 0:38 linux-next: manual merge of the renesas tree with the arm-soc tree Stephen Rothwell
2015-01-15 8:44 ` Geert Uytterhoeven [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-24 22:07 Stephen Rothwell
2015-12-02 11:21 Mark Brown
2015-12-02 11:35 ` Arnd Bergmann
2015-07-26 23:32 Stephen Rothwell
2015-07-26 23:27 Stephen Rothwell
2014-05-22 2:12 Stephen Rothwell
2013-12-15 23:47 Stephen Rothwell
2013-12-16 10:00 ` Nicolas Ferre
2013-12-17 0:19 ` Simon Horman
2014-01-04 5:11 ` Olof Johansson
2014-01-04 11:43 ` Stephen Rothwell
2014-01-05 5:54 ` Simon Horman
2014-01-06 9:44 ` Nicolas Ferre
2014-01-08 16:56 ` Mike Turquette
2013-04-19 6:59 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=CAMuHMdVjtVfTQyqMZYeXiPCMoeyxxUv-ikxRvM3uw9FCGTQ+BA@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=damm+renesas@opensource.se \
--cc=geert+renesas@glider.be \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pbrobinson@gmail.com \
--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).