From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>, Chenyi Qiang <chenyi.qiang@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tao Xu <tao3.xu@intel.com>, Xiaoyao Li <xiaoyao.li@intel.com>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree
Date: Fri, 15 Jul 2022 15:55:56 +1000 [thread overview]
Message-ID: <20220715155556.77911cfe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/x86.c
between commit:
1b870fa5573e ("kvm: stats: tell userspace which values are boolean")
from the kvm-fixes tree and commit:
2f4073e08f4c ("KVM: VMX: Enable Notify VM exit")
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/x86.c
index af0c5b5fc28f,031678eff28e..000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -298,7 -286,8 +286,8 @@@ const struct _kvm_stats_desc kvm_vcpu_s
STATS_DESC_COUNTER(VCPU, directed_yield_successful),
STATS_DESC_COUNTER(VCPU, preemption_reported),
STATS_DESC_COUNTER(VCPU, preemption_other),
- STATS_DESC_IBOOLEAN(VCPU, guest_mode)
- STATS_DESC_ICOUNTER(VCPU, guest_mode),
++ STATS_DESC_IBOOLEAN(VCPU, guest_mode),
+ STATS_DESC_COUNTER(VCPU, notify_window_exits),
};
const struct kvm_stats_header kvm_vcpu_stats_header = {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-15 5:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 5:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-06-24 4:09 linux-next: manual merge of the kvm tree with the kvm-fixes tree Stephen Rothwell
2022-04-13 2:34 Stephen Rothwell
2022-02-23 20:00 broonie
2022-02-22 19:46 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=20220715155556.77911cfe@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chenyi.qiang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=tao3.xu@intel.com \
--cc=xiaoyao.li@intel.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).