Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 5 Jul 2023 09:46:21 +1000
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
Message-ID: <20230705094406.0240c3b9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Z.i2rJ8/r1G0yke.OZgGA8S";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Z.i2rJ8/r1G0yke.OZgGA8S
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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_DYNA=
MIC_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

--Sig_/Z.i2rJ8/r1G0yke.OZgGA8S
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSkr00ACgkQAVBC80lX
0Gzz3wgAnYVANI/D6rlcbxNdlBIMWGoeu2gSEGRkT3Q0cr1l0r4sNjMslkhY8WiO
bzJ4Zew1iNXctgsrH4MJ3L9u5qfqd26op3JXgAobJNJ7Fmj3yHep+pDo1yGHPUqH
5jMOkk8CMKquGssBV4buR0+IwOVn7s0NbjbQQG15Amlwq+Gg9ozTgFtxD1JPthoQ
YMhxa37CoRz//UJ+61DvxqxGqm1gVHwrqpKV1X91AceqEkOzuLm4HWfRNKC60kq/
dAs8DUc1uOM92Q58bJ8vNdCGD27jlS9youNuu5+c7HL3rYpNkqcZYzyXh6ZhWyNG
n2K46nP72AnIohZgW1AU6uf+f6iKTg==
=+dxN
-----END PGP SIGNATURE-----

--Sig_/Z.i2rJ8/r1G0yke.OZgGA8S--