diff mbox series

linux-next: manual merge of the risc-v tree with Linus' tree

Message ID 20230705094406.0240c3b9@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the risc-v tree with Linus' tree |

Commit Message

Stephen Rothwell July 4, 2023, 11:46 p.m. UTC 
  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.
diff mbox series

Patch

diff --cc arch/riscv/Kconfig
index 6c12512d8278,c8c22cf11602..000000000000
--- a/arch/riscv/Kconfig