From: Kevin Hilman Date: Mon, 11 May 2015 23:36:30 +0000 (-0700) Subject: Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android X-Git-Tag: firefly_0821_release~3680^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96ba231c1546b7c5d20e90437f45bd9089316b86;p=firefly-linux-kernel-4.4.55.git Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android Conflicts: arch/arm64/kernel/Makefile --- 96ba231c1546b7c5d20e90437f45bd9089316b86 diff --cc arch/arm64/kernel/Makefile index 58895f0ba938,12618cbd1bab..b52313653742 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@@ -15,10 -15,9 +15,10 @@@ CFLAGS_REMOVE_return_address.o = -p arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ entry-fpsimd.o process.o ptrace.o setup.o signal.o \ sys.o stacktrace.o time.o traps.o io.o vdso.o \ - hyp-stub.o psci.o cpu_ops.o insn.o return_address.o \ - hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o return_address.o ++ hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o return_address.o \ + opcodes.o -arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ +arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o