* Re: Upcoming merge conflict between ftrace and s390 trees
2021-10-20 14:40 Upcoming merge conflict between ftrace and s390 trees Heiko Carstens
@ 2021-10-26 13:42 ` Vasily Gorbik
2021-10-26 14:29 ` Steven Rostedt
2021-10-26 19:32 ` Steven Rostedt
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Vasily Gorbik @ 2021-10-26 13:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Heiko Carstens, Steven Rostedt, Jiri Olsa, linux-next
On Wed, Oct 20, 2021 at 04:40:39PM +0200, Heiko Carstens 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=c316eb4460463b6dd1aee6d241cb20323a0030aa
>
> And soon this patch will likely be within the ftrace tree:
> https://lore.kernel.org/lkml/20211008091336.33616-9-jolsa@kernel.org/
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Upcoming merge conflict between ftrace and s390 trees
2021-10-26 13:42 ` Vasily Gorbik
@ 2021-10-26 14:29 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2021-10-26 14:29 UTC (permalink / raw)
To: Vasily Gorbik; +Cc: Stephen Rothwell, Heiko Carstens, Jiri Olsa, linux-next
On Tue, 26 Oct 2021 15:42:24 +0200
Vasily Gorbik <gor@linux.ibm.com> wrote:
> On Wed, Oct 20, 2021 at 04:40:39PM +0200, Heiko Carstens 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=c316eb4460463b6dd1aee6d241cb20323a0030aa
> >
> > And soon this patch will likely be within the ftrace tree:
> > https://lore.kernel.org/lkml/20211008091336.33616-9-jolsa@kernel.org/
> >
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Upcoming merge conflict between ftrace and s390 trees
2021-10-20 14:40 Upcoming merge conflict between ftrace and s390 trees Heiko Carstens
2021-10-26 13:42 ` Vasily Gorbik
@ 2021-10-26 19:32 ` Steven Rostedt
2021-10-27 3:16 ` Stephen Rothwell
2021-11-02 21:02 ` Stephen Rothwell
3 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2021-10-26 19:32 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Stephen Rothwell, Jiri Olsa, Vasily Gorbik, linux-next
On Wed, 20 Oct 2021 16:40:39 +0200
Heiko Carstens <hca@linux.ibm.com> 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.
>
> 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/20211008091336.33616-9-jolsa@kernel.org/
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Upcoming merge conflict between ftrace and s390 trees
2021-10-20 14:40 Upcoming merge conflict between ftrace and s390 trees Heiko Carstens
2021-10-26 13:42 ` Vasily Gorbik
2021-10-26 19:32 ` Steven Rostedt
@ 2021-10-27 3:16 ` Stephen Rothwell
2021-11-02 21:02 ` Stephen Rothwell
3 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-27 3:16 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Steven Rostedt, Jiri Olsa, Vasily Gorbik, linux-next
[-- Attachment #1: Type: text/plain, Size: 2940 bytes --]
Hi all,
On Wed, 20 Oct 2021 16:40:39 +0200 Heiko Carstens <hca@linux.ibm.com> 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=c316eb4460463b6dd1aee6d241cb20323a0030aa
>
> And soon this patch will likely be within the ftrace tree:
> https://lore.kernel.org/lkml/20211008091336.33616-9-jolsa@kernel.org/
>
> Maybe Steven could reply to this when he applies it.
>
> This would be required to fix the conflict:
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 999907dd7544..d654b95a1e3e 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -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
> diff --git a/samples/Kconfig b/samples/Kconfig
> index 0823b97d8546..7561f3e42296 100644
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@ -229,3 +229,6 @@ endif # SAMPLES
>
> config HAVE_SAMPLE_FTRACE_DIRECT
> bool
> +
> +config HAVE_SAMPLE_FTRACE_MULTI_DIRECT
> + bool
> diff --git a/samples/Makefile b/samples/Makefile
> index 291663e56a3c..7a38538b577d 100644
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@ -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/
> diff --git a/samples/ftrace/Makefile b/samples/ftrace/Makefile
> index ab1d1c05c288..e8a3f8520a44 100644
> --- a/samples/ftrace/Makefile
> +++ b/samples/ftrace/Makefile
> @@ -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 :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Upcoming merge conflict between ftrace and s390 trees
2021-10-20 14:40 Upcoming merge conflict between ftrace and s390 trees Heiko Carstens
` (2 preceding siblings ...)
2021-10-27 3:16 ` Stephen Rothwell
@ 2021-11-02 21:02 ` Stephen Rothwell
3 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-11-02 21:02 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Steven Rostedt, Jiri Olsa, Vasily Gorbik, linux-next
[-- Attachment #1: Type: text/plain, Size: 2802 bytes --]
Hi Heiko,
On Wed, 20 Oct 2021 16:40:39 +0200 Heiko Carstens <hca@linux.ibm.com> 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=c316eb4460463b6dd1aee6d241cb20323a0030aa
>
> And soon this patch will likely be within the ftrace tree:
> https://lore.kernel.org/lkml/20211008091336.33616-9-jolsa@kernel.org/
>
> Maybe Steven could reply to this when he applies it.
>
> This would be required to fix the conflict:
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 999907dd7544..d654b95a1e3e 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -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
> diff --git a/samples/Kconfig b/samples/Kconfig
> index 0823b97d8546..7561f3e42296 100644
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@ -229,3 +229,6 @@ endif # SAMPLES
>
> config HAVE_SAMPLE_FTRACE_DIRECT
> bool
> +
> +config HAVE_SAMPLE_FTRACE_MULTI_DIRECT
> + bool
> diff --git a/samples/Makefile b/samples/Makefile
> index 291663e56a3c..7a38538b577d 100644
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@ -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/
> diff --git a/samples/ftrace/Makefile b/samples/ftrace/Makefile
> index ab1d1c05c288..e8a3f8520a44 100644
> --- a/samples/ftrace/Makefile
> +++ b/samples/ftrace/Makefile
> @@ -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).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread