lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <3097971.rZTsHKr4DO@wuerfel>
Date:	Tue, 13 Jan 2015 14:18:32 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	linux-arm-kernel@...ts.infradead.org
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Shawn Guo <shawn.guo@...aro.org>,
	Olof Johansson <olof@...om.net>,
	Anson Huang <b20788@...escale.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Peter Robinson <pbrobinson@...il.com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm-soc tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ