From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Donglin Peng <pengdonglin@sangfor.com.cn>,
Jisheng Zhang <jszhang@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Palmer Dabbelt <palmer@rivosinc.com>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Date: Wed, 5 Jul 2023 09:46:21 +1000 [thread overview]
Message-ID: <20230705094406.0240c3b9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/Kconfig
between commit:
b97aec082b51 ("riscv: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")
from Linus' tree and commit:
ab7fa6b05ebb ("riscv: move options to keep entries sorted")
from the risc-v tree.
I fixed it up (see below) and can carry the fix as necessary. This is
now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/riscv/Kconfig
index 6c12512d8278,c8c22cf11602..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -105,6 -105,11 +105,12 @@@ config RISC
select HAVE_CONTEXT_TRACKING_USER
select HAVE_DEBUG_KMEMLEAK
select HAVE_DMA_CONTIGUOUS if MMU
+ select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE)
+ select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
+ select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
++ select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
+ select HAVE_FUNCTION_GRAPH_TRACER
+ select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
select HAVE_EBPF_JIT if MMU
select HAVE_FUNCTION_ARG_ACCESS_API
select HAVE_FUNCTION_ERROR_INJECTION
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-07-04 23:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-04 23:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-11 22:55 linux-next: manual merge of the risc-v tree with Linus' tree Stephen Rothwell
2024-01-07 22:49 Stephen Rothwell
2024-01-11 17:20 ` Palmer Dabbelt
2023-11-02 22:14 Stephen Rothwell
2023-08-30 23:29 Stephen Rothwell
2023-08-31 17:50 ` Nick Desaulniers
2023-09-01 15:46 ` Palmer Dabbelt
2023-08-30 23:25 Stephen Rothwell
2023-06-04 22:51 Stephen Rothwell
2023-02-05 22:48 Stephen Rothwell
2023-02-05 22:40 Stephen Rothwell
2023-02-05 22:43 ` Stephen Rothwell
2023-01-08 21:42 Stephen Rothwell
2022-12-12 23:03 Stephen Rothwell
2022-10-13 22:11 Stephen Rothwell
2022-07-24 23:33 Stephen Rothwell
2022-03-22 22:06 Stephen Rothwell
2021-12-19 22:47 Stephen Rothwell
2021-07-05 23:32 Stephen Rothwell
2021-06-14 23:26 Stephen Rothwell
2021-04-26 23:42 Stephen Rothwell
2021-03-30 22:40 Stephen Rothwell
2021-04-02 4:33 ` Palmer Dabbelt
2021-02-23 22:00 Stephen Rothwell
2020-10-25 22:01 Stephen Rothwell
2020-01-13 22:05 Stephen Rothwell
2020-01-05 22:32 Stephen Rothwell
2020-01-06 1:50 ` Paul Walmsley
2020-01-06 1:55 ` 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=20230705094406.0240c3b9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=palmer@rivosinc.com \
--cc=paul@pwsan.com \
--cc=pengdonglin@sangfor.com.cn \
--cc=rostedt@goodmis.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).