From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul@pwsan.com>
Cc: Anup Patel <anup.patel@wdc.com>, Anup Patel <anup@brainfault.org>,
Atish Patra <atish.patra@wdc.com>,
Atish Patra <atishp@atishpatra.org>,
Atish Patra <atishp@rivosinc.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the kvm tree with the risc-v tree
Date: Wed, 12 Jan 2022 11:40:24 +1100 [thread overview]
Message-ID: <20220112114024.7be8aac6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1378 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/riscv/include/asm/sbi.h
between commit:
b579dfe71a6a ("RISC-V: Use SBI SRST extension when available")
from the risc-v tree and commit:
c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")
from the kvm 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/sbi.h
index 289621da4a2a,9c46dd3ff4a2..000000000000
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@@ -27,7 -27,14 +27,15 @@@ enum sbi_ext_id
SBI_EXT_IPI = 0x735049,
SBI_EXT_RFENCE = 0x52464E43,
SBI_EXT_HSM = 0x48534D,
+ SBI_EXT_SRST = 0x53525354,
+
+ /* Experimentals extensions must lie within this range */
+ SBI_EXT_EXPERIMENTAL_START = 0x08000000,
+ SBI_EXT_EXPERIMENTAL_END = 0x08FFFFFF,
+
+ /* Vendor extensions must lie within this range */
+ SBI_EXT_VENDOR_START = 0x09000000,
+ SBI_EXT_VENDOR_END = 0x09FFFFFF,
};
enum sbi_ext_base_fid {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-01-12 0:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 0:40 Stephen Rothwell [this message]
2022-01-16 21:54 ` linux-next: manual merge of the kvm tree with the risc-v tree Stephen Rothwell
2022-01-17 4:13 ` Anup Patel
2022-01-17 4:13 ` Anup Patel
2022-01-17 8:22 ` Paolo Bonzini
2022-01-17 8:22 ` Paolo Bonzini
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=20220112114024.7be8aac6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anup.patel@wdc.com \
--cc=anup@brainfault.org \
--cc=atish.patra@wdc.com \
--cc=atishp@atishpatra.org \
--cc=atishp@rivosinc.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=palmer@rivosinc.com \
--cc=paul@pwsan.com \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.