Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Nov 2024 14:53:35 +1100

Hi all,

Today's linux-next merge of the kvm-riscv tree got a conflict in:

  arch/riscv/include/asm/csr.h

between commit:

  29eedc7d1587 ("riscv: Add CSR definitions for pointer masking")

from the risc-v tree and commit:

  94a7734d0967 ("RISC-V: Add Svade and Svadu Extensions Support")

from the kvm-riscv 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/include/asm/csr.h
index fe5d4eb9adea,524cd4131c71..000000000000
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@@ -199,10 -195,7 +199,11 @@@
  /* xENVCFG flags */
  #define ENVCFG_STCE			(_AC(1, ULL) << 63)
  #define ENVCFG_PBMTE			(_AC(1, ULL) << 62)
+ #define ENVCFG_ADUE			(_AC(1, ULL) << 61)
 +#define ENVCFG_PMM			(_AC(0x3, ULL) << 32)
 +#define ENVCFG_PMM_PMLEN_0		(_AC(0x0, ULL) << 32)
 +#define ENVCFG_PMM_PMLEN_7		(_AC(0x2, ULL) << 32)
 +#define ENVCFG_PMM_PMLEN_16		(_AC(0x3, ULL) << 32)
  #define ENVCFG_CBZE			(_AC(1, UL) << 7)
  #define ENVCFG_CBCFE			(_AC(1, UL) << 6)
  #define ENVCFG_CBIE_SHIFT		4