linux-kernel - linux-next: manual merge of the msm 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]

Date:	Mon, 17 Jun 2013 17:01:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Brown <davidb@...eaurora.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Subject: linux-next: manual merge of the msm tree with the arm-soc tree

Hi David,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/boot/dts/msm8960-cdp.dts between commit e45600107b67 ("Merge tag
'msm-cleanup-for-3.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into
next/cleanup") from the arm-soc tree and commit 70f0aa52e090 ("Merge
branch 'msm-fix' into for-next") from the msm tree.

I fixed it up (the arm-soc merge used serial@...40000, the msm merge used
serial@...40000, I used the arm-soc version) 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