On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html