From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Anup Patel <anup@brainfault•org>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Alexandre Ghiti <alexghiti@rivosinc•com>,
Jinyu Tang <tjytimi@163•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Palmer Dabbelt <palmer@rivosinc•com>,
Samuel Holland <samuel.holland@sifive•com>,
Yong-Xuan Wang <yongxuan.wang@sifive•com>
Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree
Date: Fri, 22 Nov 2024 14:58:09 +1100 [thread overview]
Message-ID: <20241122145809.3d6a3feb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1626 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
arch/riscv/include/asm/hwcap.h
between commits:
2e6f6ea452aa ("riscv: Add ISA extension parsing for pointer masking")
1658ef4314b3 ("riscv: Implement cmpxchg8/16() using Zabha")
2d36fe89d872 ("riscv: Add ISA extension parsing for Ziccrse")
64f7b77f0bd9 ("Merge patch series "Zacas/Zabha support and qspinlocks"")
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/hwcap.h
index 08d2a5697466,7f72789ba3d5..000000000000
--- a/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@@ -93,11 -93,8 +93,13 @@@
#define RISCV_ISA_EXT_ZCMOP 84
#define RISCV_ISA_EXT_ZAWRS 85
#define RISCV_ISA_EXT_SVVPTC 86
-#define RISCV_ISA_EXT_SVADE 87
-#define RISCV_ISA_EXT_SVADU 88
+#define RISCV_ISA_EXT_SMMPM 87
+#define RISCV_ISA_EXT_SMNPM 88
+#define RISCV_ISA_EXT_SSNPM 89
+#define RISCV_ISA_EXT_ZABHA 90
+#define RISCV_ISA_EXT_ZICCRSE 91
++#define RISCV_ISA_EXT_SVADE 92
++#define RISCV_ISA_EXT_SVADU 93
#define RISCV_ISA_EXT_XLINUXENVCFG 127
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-22 3:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 3:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 4:00 linux-next: manual merge of the kvm-riscv tree with the risc-v tree Stephen Rothwell
2024-11-22 3:53 Stephen Rothwell
2023-10-30 1:53 Stephen Rothwell
2023-11-01 2:37 ` Stephen Rothwell
2023-11-05 22:31 ` Stephen Rothwell
2023-06-20 2:45 Stephen Rothwell
2023-07-03 0:55 ` Stephen Rothwell
2023-06-19 2:33 Stephen Rothwell
2023-07-03 0:54 ` 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=20241122145809.3d6a3feb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexghiti@rivosinc$(echo .)com \
--cc=anup@brainfault$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=samuel.holland@sifive$(echo .)com \
--cc=tjytimi@163$(echo .)com \
--cc=yongxuan.wang@sifive$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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