Messages in this thread | | | Date | Mon, 24 Mar 2014 10:30:51 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the samsung tree with the arm-soc tree |
| |
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in arch/arm/Kconfig.debug between commit 886545ea7d0b ("ARM: efm32: allow uncompress debug output") from the arm-soc tree and commit 90266754801c ("ARM: SAMSUNG: use generic uncompress.h") from the samsung tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Kconfig.debug index e5a00d421cc4,a160744312ab..000000000000 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -1167,7 -1162,7 +1167,7 @@@ config DEBUG_UNCOMPRES config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - ARCH_EXYNOS || ARCH_EFM32 - PLAT_SAMSUNG ++ PLAT_SAMSUNG || ARCH_EFM32 default "mach/uncompress.h" config EARLY_PRINTK [unhandled content-type:application/pgp-signature] | |