Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/riscv/Kconfig between commits: d3c263cda1a5 ("riscv: Add KGDB support") ce66581cb6e9 ("riscv: Use the XML target descriptions to report 3 system registers") from the risc-v tree and commit: bbb6dc9ac443 ("riscv: support DEBUG_WX") from the akpm-current 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 39f7a70cbd72,8576cc027b76..000000000000 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@@ -68,8 -67,7 +67,9 @@@ config RISC select ARCH_HAS_GCOV_PROFILE_ALL select HAVE_COPY_THREAD_TLS select HAVE_ARCH_KASAN if MMU && 64BIT + select HAVE_ARCH_KGDB + select HAVE_ARCH_KGDB_QXFER_PKT + select ARCH_HAS_DEBUG_WX config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT
Attachment:
pgp6chSaSabLW.pgp
Description: OpenPGP digital signature