From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sean Christopherson <seanjc@google•com>
Subject: linux-next: manual merge of the kvm tree with the tip tree
Date: Thu, 28 Aug 2025 11:51:58 +1000 [thread overview]
Message-ID: <20250828115158.46901da7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/Kconfig
between commit:
28d11e4548b7 ("x86/fred: KVM: VMX: Always use FRED for IRQs when CONFIG_X86_FRED=y")
from the tip tree and commit:
924121eebddc ("KVM: x86: Select TDX's KVM_GENERIC_xxx dependencies iff CONFIG_KVM_INTEL_TDX=y")
from the kvm tree.
I fixed it up (see below) 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
diff --cc arch/x86/kvm/Kconfig
index b92ef117f355,4e43923656d0..000000000000
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@@ -95,9 -96,6 +96,7 @@@ config KVM_SW_PROTECTED_V
config KVM_INTEL
tristate "KVM for Intel (and compatible) processors support"
depends on KVM && IA32_FEAT_CTL
- select KVM_GENERIC_PRIVATE_MEM if INTEL_TDX_HOST
- select KVM_GENERIC_MEMORY_ATTRIBUTES if INTEL_TDX_HOST
+ select X86_FRED if X86_64
help
Provides support for KVM on processors equipped with Intel's VT
extensions, a.k.a. Virtual Machine Extensions (VMX).
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-08-28 1:52 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-28 1:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-14 4:14 linux-next: manual merge of the kvm tree with the tip tree Stephen Rothwell
2025-04-14 5:31 ` Ingo Molnar
2024-06-19 13:54 Mark Brown
2023-01-18 0:32 Stephen Rothwell
2022-12-01 0:18 Stephen Rothwell
2022-12-01 0:14 Stephen Rothwell
2022-12-15 23:26 ` Stephen Rothwell
2022-01-10 2:16 Stephen Rothwell
2022-01-10 2:28 ` Like Xu
2021-12-13 17:46 broonie
2021-12-13 18:14 ` Paolo Bonzini
2021-12-13 18:23 ` Mark Brown
2021-10-25 5:11 Stephen Rothwell
2021-10-21 2:39 Stephen Rothwell
2021-10-21 15:32 ` Borislav Petkov
2021-04-22 4:30 Stephen Rothwell
2021-04-22 4:45 ` Nadav Amit
2021-04-22 4:58 ` Stephen Rothwell
2021-04-22 6:29 ` Paolo Bonzini
2020-07-29 6:47 Stephen Rothwell
2020-07-17 5:25 Stephen Rothwell
2020-06-02 4:53 Stephen Rothwell
2020-06-04 3:09 ` Stephen Rothwell
2020-01-16 2:48 Stephen Rothwell
2018-12-19 4:12 Stephen Rothwell
2018-12-17 5:22 Stephen Rothwell
2018-10-19 3:25 Stephen Rothwell
2018-08-08 3:54 Stephen Rothwell
2018-08-15 4:27 ` Stephen Rothwell
2018-08-06 5:12 Stephen Rothwell
2018-08-06 6:27 ` Tianyu Lan
2018-02-02 0:51 Stephen Rothwell
2018-01-15 2:39 Stephen Rothwell
2017-08-28 4:52 Stephen Rothwell
2017-09-04 6:09 ` Stephen Rothwell
2017-08-25 4:39 Stephen Rothwell
2017-08-25 6:39 ` Paolo Bonzini
2017-08-25 13:57 ` Tom Lendacky
2017-08-25 16:53 ` Brijesh Singh
2017-08-25 20:05 ` Paolo Bonzini
2017-08-25 20:41 ` Brijesh Singh
2017-08-25 20:42 ` Paolo Bonzini
2017-08-26 7:24 ` Ingo Molnar
2016-11-28 3:56 Stephen Rothwell
2016-11-17 3:50 Stephen Rothwell
2016-11-17 7:07 ` Thomas Gleixner
2016-11-17 21:31 ` Stephen Rothwell
2016-05-12 2:54 Stephen Rothwell
2015-06-19 4:59 Michael Ellerman
2015-05-26 4:45 Stephen Rothwell
2012-11-30 4:26 Stephen Rothwell
2012-05-16 7:14 Stephen Rothwell
2012-05-16 7:53 ` Gleb Natapov
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=20250828115158.46901da7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/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