From: Paolo Bonzini <pbonzini@redhat.com>
To: Anup Patel <anup@brainfault.org>, Palmer Dabbelt <palmer@dabbelt.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Paul Walmsley <paul@pwsan.com>, KVM <kvm@vger.kernel.org>,
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>,
linux-riscv <linux-riscv@lists.infradead.org>
Subject: Re: linux-next: manual merge of the kvm tree with the risc-v tree
Date: Mon, 17 Jan 2022 09:22:04 +0100 [thread overview]
Message-ID: <b8c2663b-69df-913f-8da1-de6b7bd189ce@redhat.com> (raw)
In-Reply-To: <CAAhSdy3gEW+SC1GCH0V4iVA9h1sxeVV-V=x4kG7w_9tcVTtamw@mail.gmail.com>
On 1/17/22 05:13, Anup Patel wrote:
> The commit c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")
> is already merged in Linus' tree.
>
> Since you are yet to send PR for 5.17, we have two options:
> 1) Rebase your for-next branch upon latest Linus' tree master branch
> 2) Send "RISC-V: Use SBI SRST extension when available" in the
> next batch of changes for 5.17 after 5.17-rc1
>
> Let me know if you want me to rebase and send v8 patch of
> "RISC-V: Use SBI SRST extension when available"
>
> In future, we should coordinate and use a shared tag for such
> conflicting changes.
Palmer should just send it to Linus and note "enum sbi_ext_id has a
trivial conflict" in the pull request message.
We'll sort it out better in the future, but it's such a minor conflict
that it is not even a nuisance.
Paolo
prev parent reply other threads:[~2022-01-17 8:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 0:40 linux-next: manual merge of the kvm tree with the risc-v tree Stephen Rothwell
2022-01-16 21:54 ` Stephen Rothwell
2022-01-17 4:13 ` Anup Patel
2022-01-17 8:22 ` Paolo Bonzini [this message]
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=b8c2663b-69df-913f-8da1-de6b7bd189ce@redhat.com \
--to=pbonzini@redhat.com \
--cc=anup@brainfault.org \
--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=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=palmer@rivosinc.com \
--cc=paul@pwsan.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).