From: Sean Christopherson <seanjc@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paul Durrant <pdurrant@amazon.com>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm tree
Date: Tue, 20 Feb 2024 07:33:40 -0800 [thread overview]
Message-ID: <ZdTGRQJIO0Te8zF8@google.com> (raw)
In-Reply-To: <20240220134800.40efe653@canb.auug.org.au>
On Tue, Feb 20, 2024, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commit:
>
> bcac0477277e ("KVM: x86: move x86-specific structs to uapi/asm/kvm.h")
>
> from the kvm tree and commits:
>
> 01a871852b11 ("KVM: x86/xen: allow shared_info to be mapped by fixed HVA")
> 3a0c9c41959d ("KVM: x86/xen: allow vcpu_info to be mapped by fixed HVA")
>
> from the kvm-x86 tree.
/facepalm
I asked Paolo for a topic branch specifically to avoid this conflict, and then
managed to forget about it. I'll rebase the xen patches and force push.
next prev parent reply other threads:[~2024-02-20 15:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 2:48 linux-next: manual merge of the kvm-x86 tree with the kvm tree Stephen Rothwell
2024-02-20 15:33 ` Sean Christopherson [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 3:14 Stephen Rothwell
2024-07-17 3:58 Stephen Rothwell
2026-02-12 14:08 Mark Brown
2026-02-12 14:14 ` Paolo Bonzini
2026-02-12 15:21 ` Sean Christopherson
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=ZdTGRQJIO0Te8zF8@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=pdurrant@amazon.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 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.