linux-kernel - Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

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] [day] [month] [year] [list]

Date:	Tue, 13 Jan 2015 02:05:38 +0100
From:	Andrew Lunn <andrew@...n.ch>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jason Cooper <jason@...edaemon.net>,
	gregory.clement@...e-electrons.com,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Evgeni Dobrev <evgeni@...dio-punkt.com>,
	Peter Robinson <pbrobinson@...il.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

On Tue, Jan 13, 2015 at 11:20:16AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 ("ARM: dts: Only
> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> tree and commit dd7d2be1d2b8 ("Kirkwood: add support for Seagate
> BlackArmor NAS220") from the mvebu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc arch/arm/boot/dts/Makefile
> index abb810f1fe29,17ee1d6a0ac0..000000000000
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@@ -112,24 -101,18 +112,25 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
>   	exynos5440-sd5v1.dtb \
>   	exynos5440-ssdk5440.dtb \
>   	exynos5800-peach-pi.dtb
>  -dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
>  -dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
>  -dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
>  +dtb-$(CONFIG_ARCH_HI3xxx) += \
>  +	hi3620-hi4511.dtb
>  +dtb-$(CONFIG_ARCH_HIX5HD2) += \
>  +	hisi-x5hd2-dkb.dtb
>  +dtb-$(CONFIG_ARCH_HIGHBANK) += \
>  +	highbank.dtb \
>   	ecx-2000.dtb
>  -dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
>  -dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
>  +dtb-$(CONFIG_ARCH_HIP04) += \
>  +	hip04-d01.dtb
>  +dtb-$(CONFIG_ARCH_INTEGRATOR) += \
>  +	integratorap.dtb \
>   	integratorcp.dtb
>  -dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
>  +dtb-$(CONFIG_ARCH_KEYSTONE) += \
>  +	k2hk-evm.dtb \
>   	k2l-evm.dtb \
>   	k2e-evm.dtb
>  -dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
>  +dtb-$(CONFIG_MACH_KIRKWOOD) += \
>  +	kirkwood-b3.dtb \
> + 	kirkwood-blackarmor-nas220.dtb \
>   	kirkwood-cloudbox.dtb \
>   	kirkwood-d2net.dtb \
>   	kirkwood-db-88f6281.dtb \

Hi Stephen

Thanks for the fixup.

       Andrew
--
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/