Messages in this thread | | | Date | Mon, 7 Nov 2011 10:33:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with Linus' tree |
| |
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/Kconfig between commit830145796a5c ("ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos") from Linus' tree and commit 8f7e34205f6f ("Merge branch 'next/cleanup3' into for-next") from the arm-soc tree.
I just used the version from Linus' tree. Arnd, it seems that some of these merges were done differently by Linus, so can you please clean up the arm-soc tree now that it looks like Linus may have merged all its content. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |