# git rev-parse -q --verify 900be8ab1549359ba980cfb042a043128204a963^{commit} 900be8ab1549359ba980cfb042a043128204a963 already have revision, skipping fetch # git checkout -q -f -B kisskb 900be8ab1549359ba980cfb042a043128204a963 # git clean -qxdf # < git log -1 # commit 900be8ab1549359ba980cfb042a043128204a963 # Merge: 7b9a44c 6c0a8f6 # Author: Michael Ellerman # Date: Thu May 10 00:35:19 2018 +1000 # # Automatic merge of branches 'master', 'next' and 'fixes' into merge # # Conflicts: # arch/powerpc/include/asm/ftrace.h # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 900be8ab1549359ba980cfb042a043128204a963 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc85xx_smp_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- mpc85xx_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc85xx_smp_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/arch/powerpc/kernel/syscalls.c:24: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/init/main.c:20: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/livepatch.h:25, from /kisskb/src/arch/powerpc/kernel/signal.c:17: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/syscalls.o' failed make[2]: *** [arch/powerpc/kernel/syscalls.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/signal.o' failed make[2]: *** [arch/powerpc/kernel/signal.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/arch/powerpc/kernel/module_32.c:28: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/module_32.o' failed make[2]: *** [arch/powerpc/kernel/module_32.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/main.o' failed make[2]: *** [init/main.o] Error 1 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/init/do_mounts.h:5, from /kisskb/src/init/do_mounts.c:36: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/arch/powerpc/kernel/smp.c:62:0: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/arch/powerpc/kernel/smp.c: In function 'start_secondary': /kisskb/src/arch/powerpc/kernel/smp.c:1071:2: error: implicit declaration of function 'this_cpu_enable_ftrace' [-Werror=implicit-function-declaration] /kisskb/src/arch/powerpc/kernel/smp.c: In function '__cpu_disable': /kisskb/src/arch/powerpc/kernel/smp.c:1169:2: error: implicit declaration of function 'this_cpu_disable_ftrace' [-Werror=implicit-function-declaration] /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/do_mounts.o' failed make[2]: *** [init/do_mounts.o] Error 1 cc1: all warnings being treated as errors /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/smp.o' failed make[2]: *** [arch/powerpc/kernel/smp.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/init_task.h:9, from /kisskb/src/init/init_task.c:2: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/init_task.o' failed make[2]: *** [init/init_task.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/arch/powerpc/include/asm/livepatch.h:23, from /kisskb/src/arch/powerpc/kernel/irq.c:68: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/init_task.h:9, from /kisskb/src/arch/powerpc/kernel/process.c:32: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/irq.o' failed make[2]: *** [arch/powerpc/kernel/irq.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/include/asm/emulated_ops.h:22, from /kisskb/src/arch/powerpc/kernel/align.c:26: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/kprobes.h:42, from /kisskb/src/arch/powerpc/lib/code-patching.c:11: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/process.o' failed make[2]: *** [arch/powerpc/kernel/process.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/lib/code-patching.o' failed make[2]: *** [arch/powerpc/lib/code-patching.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/align.o' failed make[2]: *** [arch/powerpc/kernel/align.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/init/initramfs.c:20: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/init/do_mounts.h:5, from /kisskb/src/init/do_mounts_initrd.c:22: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/init/do_mounts.h:5, from /kisskb/src/init/do_mounts_rd.c:22: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/kprobes.h:42, from /kisskb/src/arch/powerpc/kernel/traps.c:34: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/do_mounts_rd.o' failed make[2]: *** [init/do_mounts_rd.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/kprobes.h:42, from /kisskb/src/arch/powerpc/mm/fault.c:31: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/arch/powerpc/kernel/ptrace.c:32: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/traps.o' failed make[2]: *** [arch/powerpc/kernel/traps.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/do_mounts_initrd.o' failed make[2]: *** [init/do_mounts_initrd.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/ptrace.o' failed make[2]: *** [arch/powerpc/kernel/ptrace.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'init/initramfs.o' failed make[2]: *** [init/initramfs.o] Error 1 /kisskb/src/Makefile:1060: recipe for target 'init' failed make[1]: *** [init] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/arch/powerpc/include/asm/livepatch.h:23, from /kisskb/src/arch/powerpc/kernel/setup-common.c:67: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/mm/fault.o' failed make[2]: *** [arch/powerpc/mm/fault.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/kernel/setup-common.o' failed make[2]: *** [arch/powerpc/kernel/setup-common.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/perf/perf_regs.c:14: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/perf/callchain.c:13: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/init_task.h:9, from /kisskb/src/kernel/cgroup/cgroup.c:35: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/perf/perf_regs.o' failed make[2]: *** [arch/powerpc/perf/perf_regs.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/perf/callchain.o' failed make[2]: *** [arch/powerpc/perf/callchain.o] Error 1 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/trace_events.h:20, from /kisskb/src/include/trace/define_trace.h:96, from /kisskb/src/include/trace/events/xdp.h:227, from /kisskb/src/include/linux/bpf_trace.h:6, from /kisskb/src/kernel/bpf/core.c:1840: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'kernel/bpf/core.o' failed make[3]: *** [kernel/bpf/core.o] Error 1 /kisskb/src/scripts/Makefile.build:559: recipe for target 'kernel/bpf' failed make[2]: *** [kernel/bpf] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/perf/e500-pmu.c:13: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'kernel/cgroup/cgroup.o' failed make[3]: *** [kernel/cgroup/cgroup.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/perf/core-fsl-emb.c:14: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/include/linux/trace_events.h:10, from /kisskb/src/include/trace/syscall.h:7, from /kisskb/src/include/linux/syscalls.h:82, from /kisskb/src/kernel/events/core.c:34: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/Makefile:1060: recipe for target 'arch/powerpc/kernel' failed make[1]: *** [arch/powerpc/kernel] Error 2 /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/perf/e500-pmu.o' failed make[2]: *** [arch/powerpc/perf/e500-pmu.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/perf/core-fsl-emb.o' failed make[2]: *** [arch/powerpc/perf/core-fsl-emb.o] Error 1 /kisskb/src/Makefile:1060: recipe for target 'arch/powerpc/lib' failed make[1]: *** [arch/powerpc/lib] Error 2 /kisskb/src/scripts/Makefile.build:312: recipe for target 'kernel/events/core.o' failed make[3]: *** [kernel/events/core.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/arch/powerpc/perf/e6500-pmu.c:16: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/kernel/events/callchain.c:12: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'kernel/events/callchain.o' failed make[3]: *** [kernel/events/callchain.o] Error 1 /kisskb/src/scripts/Makefile.build:312: recipe for target 'arch/powerpc/perf/e6500-pmu.o' failed make[2]: *** [arch/powerpc/perf/e6500-pmu.o] Error 1 /kisskb/src/Makefile:1060: recipe for target 'arch/powerpc/perf' failed make[1]: *** [arch/powerpc/perf] Error 2 In file included from /kisskb/src/include/linux/ftrace.h:21:0, from /kisskb/src/include/linux/perf_event.h:48, from /kisskb/src/kernel/events/ring_buffer.c:12: /kisskb/src/arch/powerpc/include/asm/ftrace.h:2:0: error: unterminated #ifndef /kisskb/src/scripts/Makefile.build:312: recipe for target 'kernel/events/ring_buffer.o' failed make[3]: *** [kernel/events/ring_buffer.o] Error 1 /kisskb/src/scripts/Makefile.build:559: recipe for target 'kernel/events' failed make[2]: *** [kernel/events] Error 2 /kisskb/src/Makefile:1060: recipe for target 'arch/powerpc/mm' failed make[1]: *** [arch/powerpc/mm] Error 2 /kisskb/src/scripts/Makefile.build:559: recipe for target 'kernel/cgroup' failed make[2]: *** [kernel/cgroup] Error 2 /kisskb/src/Makefile:1060: recipe for target 'kernel' failed make[1]: *** [kernel] Error 2 Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc85xx_smp_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-merge_mpc85xx_smp_defconfig_powerpc # Build took: 0:00:11.832491