Upcoming merge conflict between ftrace and s390 trees
Subsystems (3)
Hi Stephen,
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aa
And soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/
Maybe Steven could reply to this when he applies it.
This would be required to fix the conflict:
arch/x86/Kconfig +1 -0
@@ -190,6 +190,7 @@ config X86 select HAVE_DYNAMIC_FTRACE_WITH_ARGS if X86_64 select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_SAMPLE_FTRACE_DIRECT if X86_64 + select HAVE_SAMPLE_FTRACE_MULTI_DIRECT if X86_64 select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_EISA
samples/Kconfig +3 -0
@@ -229,3 +229,6 @@ endif # SAMPLES config HAVE_SAMPLE_FTRACE_DIRECT bool + +config HAVE_SAMPLE_FTRACE_MULTI_DIRECT + bool
samples/Makefile +1 -0
@@ -21,6 +21,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/ +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/ obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/ subdir-$(CONFIG_SAMPLE_UHID) += uhid obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
samples/ftrace/Makefile +1 -1
@@ -3,7 +3,7 @@ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o -obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-multi.o +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o CFLAGS_sample-trace-array.o := -I$(src) obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o
Quoted 11 lines · Heiko Carstens
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aaAnd soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/Maybe Steven could reply to this when he applies it.
Hi Stephen,
could you please pick up this fixup from Heiko in linux-next on top of s390 tree? ftrace changes mentioned are now in linux-next and this fixup is needed to avoid s390 build error.
Thank you,
Vasily
Steven Rostedt
maintainerQuoted 11 lines · On Tue, 26 Oct 2021 15:42:24 +0200 Vasily Gorbik <[email protected]> wrote:
Quoted 10 lines · Heiko Carstens
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aaAnd soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/
Quoted 7 lines
Quoted 1 line
Maybe Steven could reply to this when he applies it.
Hi Stephen,
could you please pick up this fixup from Heiko in linux-next on top of s390 tree? ftrace changes mentioned are now in linux-next and this fixup is needed to avoid s390 build error.
Ah, I missed this.
Yes, I have that code pushed to my for-next branch.
-- Steve
Steven Rostedt
maintainerQuoted 6 lines · On Wed, 20 Oct 2021 16:40:39 +0200 Heiko Carstens <[email protected]> wrote:
Hi Stephen,
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
Quoted 7 lines
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aaAnd soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/Maybe Steven could reply to this when he applies it.
BTW, is this in your tree, or would you like me to take this through my tree?
If so, I need a proper patch.
-- Steve
Hi all,
Quoted 55 lines · On Wed, 20 Oct 2021 16:40:39 +0200 Heiko Carstens <[email protected]> wrote:
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aaAnd soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/Maybe Steven could reply to this when he applies it.
This would be required to fix the conflict:
arch/x86/Kconfig +1
-0@@ -190,6 +190,7 @@ config X86 select HAVE_DYNAMIC_FTRACE_WITH_ARGS if X86_64 select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_SAMPLE_FTRACE_DIRECT if X86_64 + select HAVE_SAMPLE_FTRACE_MULTI_DIRECT if X86_64 select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_EISAsamples/Kconfig +3
-0@@ -229,3 +229,6 @@ endif # SAMPLES config HAVE_SAMPLE_FTRACE_DIRECT bool + +config HAVE_SAMPLE_FTRACE_MULTI_DIRECT + boolsamples/Makefile +1
-0@@ -21,6 +21,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/ +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/ obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/ subdir-$(CONFIG_SAMPLE_UHID) += uhid obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/samples/ftrace/Makefile +0
-0
samples/ftrace/Makefile line 9
Quoted 8 lines
samples/ftrace/Makefile +1
-1@@ -3,7 +3,7 @@ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o -obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-multi.o +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o CFLAGS_sample-trace-array.o := -I$(src) obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o
I have applied that as a merge fixup in linux-next today. I assume that it would apply directly to the ftrace tree so a proper patch should be sent to Steve (as he asked). It is clearly needed as ftrace-direct-multi.c contains an x86 asm statement :-(
Signature · 2 lines
Cheers, Stephen Rothwell
Hi Heiko,
Quoted 55 lines · On Wed, 20 Oct 2021 16:40:39 +0200 Heiko Carstens <[email protected]> wrote:
just as heads-up: there will be an upcoming merge conflict between ftrace and s390 trees in linux-next which will cause a compile error for s390.
With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aaAnd soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/[email protected]/Maybe Steven could reply to this when he applies it.
This would be required to fix the conflict:
arch/x86/Kconfig +1
-0@@ -190,6 +190,7 @@ config X86 select HAVE_DYNAMIC_FTRACE_WITH_ARGS if X86_64 select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_SAMPLE_FTRACE_DIRECT if X86_64 + select HAVE_SAMPLE_FTRACE_MULTI_DIRECT if X86_64 select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_EISAsamples/Kconfig +3
-0@@ -229,3 +229,6 @@ endif # SAMPLES config HAVE_SAMPLE_FTRACE_DIRECT bool + +config HAVE_SAMPLE_FTRACE_MULTI_DIRECT + boolsamples/Makefile +1
-0@@ -21,6 +21,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/ +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/ obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/ subdir-$(CONFIG_SAMPLE_UHID) += uhid obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/samples/ftrace/Makefile +0
-0
samples/ftrace/Makefile line 9
Quoted 8 lines
samples/ftrace/Makefile +1
-1@@ -3,7 +3,7 @@ obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o -obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-multi.o +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o CFLAGS_sample-trace-array.o := -I$(src) obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o
I will now apply this to the merge of the s390 tree with Linus' tree (as the ftrace tree has been merged by Linus).
Signature · 2 lines
Cheers, Stephen Rothwell