From: Arnd Bergmann <arnd@arndb•de>
To: linux-arm-kernel@lists•infradead.org
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Shawn Guo <shawn.guo@linaro•org>, Olof Johansson <olof@lixom•net>,
Anson Huang <b20788@freescale•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Robinson <pbrobinson@gmail•com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Tue, 13 Jan 2015 14:18:32 +0100 [thread overview]
Message-ID: <3097971.rZTsHKr4DO@wuerfel> (raw)
In-Reply-To: <20150113111636.7bc5785c@canb.auug.org.au>
On Tuesday 13 January 2015 11:16:36 Stephen Rothwell wrote:
> - imx6q-tx6q-1110.dtb \
> - imx6sl-evk.dtb \
> + imx6q-tx6q-1110.dtb
> +dtb-$(CONFIG_SOC_IMX6SL) += \
> + imx6sl-evk.dtb
> +dtb-$(CONFIG_SOC_IMX6SX) += \
> + imx6sx-sabreauto.dtb \
> imx6sx-sdb.dtb \
> +dtb-$(CONFIG_SOC_LS1021A) += \
> ls1021a-qds.dtb \
> - ls1021a-twr.dtb \
> + ls1021a-twr.dtb
> +dtb-$(CONFIG_SOC_VF610) += \
>
There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused
build errors for me. We should soon be able to merge the other branches into
arm-soc to avoid the entire set of merge conflicts, until then please
change your recorded resolution to avoid the build error.
Thanks!
Arnd
next prev parent reply other threads:[~2015-01-13 13:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 0:16 linux-next: manual merge of the imx-mxs tree with the arm-soc tree Stephen Rothwell
2015-01-13 13:18 ` Arnd Bergmann [this message]
2015-01-13 20:29 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 0:43 Stephen Rothwell
2019-04-29 23:49 Stephen Rothwell
2018-03-26 22:10 Stephen Rothwell
2018-03-27 7:55 ` Shawn Guo
2018-03-27 7:59 ` Arnd Bergmann
2017-10-30 11:58 Mark Brown
2015-06-01 0:54 Stephen Rothwell
2015-05-21 0:58 Stephen Rothwell
2014-03-03 1:58 Stephen Rothwell
2014-02-20 0:42 Stephen Rothwell
2014-02-20 1:30 ` Shawn Guo
2014-01-05 23:42 Stephen Rothwell
2014-01-05 23:38 Stephen Rothwell
2013-06-19 6:24 Stephen Rothwell
2013-06-03 5:41 Stephen Rothwell
2013-04-10 7:33 Stephen Rothwell
2013-04-02 6:57 Stephen Rothwell
2013-04-02 6:55 Stephen Rothwell
2013-03-22 4:09 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=3097971.rZTsHKr4DO@wuerfel \
--to=arnd@arndb$(echo .)de \
--cc=b20788@freescale$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=pbrobinson@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shawn.guo@linaro$(echo .)org \
/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