Messages in this thread | | | Date | Tue, 25 Jun 2019 10:03:39 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the samsung-krzk tree with the arm-soc tree |
| |
Hi all,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/mach-exynos/Makefile
between commit:
3fe1ee40b2a2 ("ARM: use arch_extension directive instead of arch argument")
from the arm-soc tree and commit:
24d2c73ff28b ("ARM: exynos: Only build MCPM support if used")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc arch/arm/mach-exynos/Makefile index 5ccf9d7e58d4,5abf3db23912..000000000000 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@@ -14,5 -14,9 +14,5 @@@ obj-$(CONFIG_PM_SLEEP) += suspend. obj-$(CONFIG_SMP) += platsmp.o headsmp.o - obj-$(CONFIG_MCPM) += mcpm-exynos.o -plus_sec := $(call as-instr,.arch_extension sec,+sec) -AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) -AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec) - + obj-$(CONFIG_EXYNOS_MCPM) += mcpm-exynos.o CFLAGS_mcpm-exynos.o += -march=armv7-a [unhandled content-type:application/pgp-signature] | |