From: Marc Zyngier <maz@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
Christoffer Dall <cdall@cs.columbia.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the kvm-x86 tree
Date: Tue, 24 Jan 2023 08:46:57 +0000 [thread overview]
Message-ID: <86a628mi9q.wl-maz@kernel.org> (raw)
In-Reply-To: <20230124125515.7c88c9fb@canb.auug.org.au>
Hi Stephen,
On Tue, 24 Jan 2023 01:55:15 +0000,
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in other tree(s?) as different
> commits (but the same patches):
>
> 0b6639e8ed87 ("KVM: s390: Move hardware setup/unsetup to init/exit")
> 0c2be59e0b53 ("KVM: x86: Use KBUILD_MODNAME to specify vendor module name")
> 1334f214d19f ("KVM: s390: Unwind kvm_arch_init() piece-by-piece() if a step fails")
[...]
> I guess someone has rebased one of the kvm trees and it had already been
> merged into another (like the kvm or kvm-arm trees).
Huh, that's worrying. I'm carrying the kvm-hw-enable-refactor branch
from the KVM tree, which I understood to be a stable branch[1], and
which I merged to avoid conflicts to be propagated everywhere.
Paolo, Sean: what is the *real* status of this branch?
M.
[1] https://lore.kernel.org/r/4d73d1b9-2c28-ab6a-2963-579bcc7a9e67@redhat.com
--
Without deviation from the norm, progress is not possible.
next prev parent reply other threads:[~2023-01-24 8:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 1:55 linux-next: duplicate patches in the kvm-x86 tree Stephen Rothwell
2023-01-24 8:46 ` Marc Zyngier [this message]
2023-01-24 11:09 ` Paolo Bonzini
2023-01-24 16:15 ` Sean Christopherson
-- strict thread matches above, loose matches on Subject: below --
2023-09-08 0:18 Stephen Rothwell
2023-09-08 1:18 ` Sean Christopherson
2023-10-17 4:37 Stephen Rothwell
2023-10-17 16:34 ` Sean Christopherson
2024-07-19 3:44 Stephen Rothwell
2024-07-19 13:21 ` Sean Christopherson
2025-03-02 4:24 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=86a628mi9q.wl-maz@kernel.org \
--to=maz@kernel.org \
--cc=cdall@cs.columbia.edu \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.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).