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: Andrew Jones <ajones@ventanamicro•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mayuresh Chitale <mchitale@ventanamicro•com>,
Palmer Dabbelt <palmer@rivosinc•com>
Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree
Date: Mon, 30 Oct 2023 12:53:02 +1100 [thread overview]
Message-ID: <20231030125302.250fc7e8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 833 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
arch/riscv/include/asm/csr.h
between commit:
43c16d51a19b ("RISC-V: Enable cbo.zero in usermode")
from the risc-v tree and commits:
db3c01c7a308 ("RISCV: KVM: Add senvcfg context save/restore")
81f0f314fec9 ("RISCV: KVM: Add sstateen0 context save/restore")
from the kvm-riscv tree.
I fixed it up (I just used the latter version of this file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-30 1:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 1:53 Stephen Rothwell [this message]
2023-11-01 2:37 ` linux-next: manual merge of the kvm-riscv tree with the risc-v tree Stephen Rothwell
2023-11-05 22:31 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 4:00 Stephen Rothwell
2024-11-22 3:58 Stephen Rothwell
2024-11-22 3:53 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=20231030125302.250fc7e8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ajones@ventanamicro$(echo .)com \
--cc=anup@brainfault$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchitale@ventanamicro$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(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