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
| ||
|
Date: Mon, 27 Jul 2015 09:32:12 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Simon Horman <horms@...ge.net.au>, Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>, <linux-arm-kernel@...ts.infradead.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Magnus Damm <damm+renesas@...nsource.se>, Nicolas Pitre <nicolas.pitre@...aro.org> Subject: linux-next: manual merge of the renesas tree with the arm-soc tree Hi Simon, Today's linux-next merge of the renesas tree got conflicts in: arch/arm/mach-shmobile/board-marzen-reference.c and arch/arm/mach-shmobile/board-marzen.c between commit: 3017a8804ada ("ARM: appropriate __init annotation for const data") from the arm-soc tree and commits: d2fb6bdaffc7 ("ARM: shmobile: marzen-reference: Remove C board code") 9d35777f2b96 ("ARM: shmobile: marzen: Remove legacy board code") from the renesas tree. I fixed it up (I just removed the 2 files) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- 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