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

Message-Id: <20140318112138.75a24ca8a0719d5b3fb98720@canb.auug.org.au>
Date:	Tue, 18 Mar 2014 11:21:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Cooper <jason@...edaemon.net>, <andrew@...n.ch>,
	<gregory.clement@...e-electrons.com>,
	<linux-arm-kernel@...ts.infradead.org>,
	Olof Johansson <olof@...om.net>,
	Arnd Bergmann s <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kumar Gala <galak@...eaurora.org>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split
Qualcomm support into legacy and multiplatform") from the arm-soc tree
and commits 97623e934388 ("Merge branch 'mvebu/dt' into for-next") and
54cab10f63f2 ("Merge branch 'mvebu/soc3' into next/dt") from the mvebu
tree.

I fixed it up (which produced no git diff) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped