From: broonie@kernel.org
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Aaron Lewis <aaronlewis@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree
Date: Tue, 22 Feb 2022 19:46:35 +0000 [thread overview]
Message-ID: <20220222194635.1892866-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/x86.c
between commit:
127770ac0d043 ("KVM: x86: Add KVM_CAP_ENABLE_CAP to x86")
from the kvm-fixes tree and commit:
8a2897853c53f ("KVM: x86: return 1 unconditionally for availability of KVM_CAP_VAPIC")
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.
diff --cc arch/x86/kvm/x86.c
index 8a66d10c7a8dc,16d29d41908fa..0000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -4245,7 -4235,7 +4247,8 @@@ int kvm_vm_ioctl_check_extension(struc
case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
case KVM_CAP_VCPU_ATTRIBUTES:
case KVM_CAP_SYS_ATTRIBUTES:
+ case KVM_CAP_ENABLE_CAP:
+ case KVM_CAP_VAPIC:
r = 1;
break;
case KVM_CAP_EXIT_HYPERCALL:
next reply other threads:[~2022-02-22 19:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 19:46 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-15 5:55 linux-next: manual merge of the kvm tree with the kvm-fixes tree Stephen Rothwell
2022-06-24 4:09 Stephen Rothwell
2022-04-13 2:34 Stephen Rothwell
2022-02-23 20:00 broonie
2019-02-18 3:27 Stephen Rothwell
2018-03-29 5:11 Stephen Rothwell
2018-03-29 5:02 Stephen Rothwell
2018-03-26 5:43 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=20220222194635.1892866-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=aaronlewis@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
/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).