From: Sean Christopherson <seanjc@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree
Date: Thu, 9 Jan 2025 11:18:24 -0800 [thread overview]
Message-ID: <Z4AhAFlk5qOYMsJx@google.com> (raw)
In-Reply-To: <20250106150509.19432acd@canb.auug.org.au>
On Mon, Jan 06, 2025, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> arch/x86/kvm/cpuid.c
>
> between commit:
>
> 716f86b523d8 ("KVM: x86: Advertise SRSO_USER_KERNEL_NO to userspace")
>
> from the tip tree and commits:
>
> ccf93de484a3 ("KVM: x86: Unpack F() CPUID feature flag macros to one flag per line of code")
> 3cc359ca29ad ("KVM: x86: Rename kvm_cpu_cap_mask() to kvm_cpu_cap_init()")
> 75c489e12d4b ("KVM: x86: Add a macro for features that are synthesized into boot_cpu_data")
> 871ac338ef55 ("KVM: x86: Use only local variables (no bitmask) to init kvm_cpu_caps")
>
> from the kvm-x86 tree.
>
> I fixed it up (I think - see below) and can carry the fix as
> necessary.
Your resolution is good. I'm impressed you were able to wade through the chaos :-)
Thanks much!
next prev parent reply other threads:[~2025-01-09 19:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 4:05 linux-next: manual merge of the kvm-x86 tree with the tip tree Stephen Rothwell
2025-01-09 19:18 ` Sean Christopherson [this message]
2025-01-23 3:25 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-03-04 12:21 Mark Brown
2026-03-04 23:10 ` Sean Christopherson
2026-03-05 19:24 ` Nathan Chancellor
2026-03-06 13:24 ` Mark Brown
2026-03-06 22:48 ` Nathan Chancellor
2025-11-25 4:59 Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell
2025-11-20 4:52 Stephen Rothwell
2025-11-20 4:46 Stephen Rothwell
2025-10-20 0:07 Stephen Rothwell
2025-09-22 9:50 Mark Brown
2025-09-22 11:27 ` Aithal, Srikanth
2025-09-22 11:40 ` Mark Brown
2025-09-22 13:23 ` Mark Brown
2025-09-22 14:04 ` Sean Christopherson
2025-09-30 18:13 ` Paolo Bonzini
2025-09-19 13:50 Mark Brown
2024-02-07 4:35 Stephen Rothwell
2023-01-19 23: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=Z4AhAFlk5qOYMsJx@google.com \
--to=seanjc@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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.