All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Carstens <hca@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>,
	Jiri Olsa <jolsa@redhat.com>, Vasily Gorbik <gor@linux.ibm.com>,
	linux-next@vger.kernel.org
Subject: Upcoming merge conflict between ftrace and s390 trees
Date: Wed, 20 Oct 2021 16:40:39 +0200	[thread overview]
Message-ID: <YXAqZ/EszRisunQw@osiris> (raw)

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.

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

             reply	other threads:[~2021-10-20 14:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-20 14:40 Heiko Carstens [this message]
2021-10-26 13:42 ` Upcoming merge conflict between ftrace and s390 trees Vasily Gorbik
2021-10-26 14:29   ` Steven Rostedt
2021-10-26 19:32 ` Steven Rostedt
2021-10-27  3:16 ` Stephen Rothwell
2021-11-02 21:02 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YXAqZ/EszRisunQw@osiris \
    --to=hca@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=jolsa@redhat.com \
    --cc=linux-next@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.