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  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:	Thu, 22 May 2014 17:10:14 +1000
From:	Stephen Rothwell <>
To:	Rob Herring <>,
	Olof Johansson <>, Arnd Bergmann <>,
	Pawel Moll <>
Subject: linux-next: manual merge of the dt-rh tree with the arm-soc tree

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
arch/arm/mach-vexpress/platsmp.c between commit d2606f81d563 ("ARM:
vexpress: Simplify SMP operations for DT-powered system") from the
arm-soc tree and commit 9d0c4dfedd96 ("of/fdt: update
of_get_flat_dt_prop in prep for libfdt") from the dt-rh tree.

I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).

Stephen Rothwell          

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)

Powered by blists - more mailing lists