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: Sun, 1 Jun 2014 20:28:34 -0700 From: Olof Johansson <olof@...om.net> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Arnd Bergmann <arnd@...db.de>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, Russell King <linux@....linux.org.uk>, "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 ("ARM: l2c: > exynos: remove cache size override"), 25a9ef63cd2b ("ARM: l2c: exynos: > convert to common l2c310 early resume functionality") and 15b0bc4041ba > ("ARM: l2c: exynos: convert to generic l2c OF initialisation (and > thereby fix it)") from the arm tree and commit b5b9324a6296 ("ARM: > exynos: don't run exynos4 l2x0 setup on other platforms") from the > arm-soc tree. > > I fixed it up (the former removes the code updated by the latter) and > can carry the fix as necessary (no action is required). Looks good. Thanks. -Olof -- 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