From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <maz@kernel•org>,
Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>
Cc: Aaron Lewis <aaronlewis@google•com>,
Jing Zhang <jingzhangos@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Steven Price <steven.price@arm•com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Fri, 25 Jun 2021 15:20:13 +1000 [thread overview]
Message-ID: <20210625152013.7e121403@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
cb082bfab59a ("KVM: stats: Add fd-based API to read binary stats data")
19238e75bd8e ("kvm: x86: Allow userspace to handle emulation errors")
from the kvm tree and commit:
ea7fc1bb1cd1 ("KVM: arm64: Introduce MTE VM feature")
from the kvm-arm 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 include/uapi/linux/kvm.h
index 68c9e6d8bbda,da1edd2b4046..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1105,12 -1083,7 +1105,13 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_SGX_ATTRIBUTE 196
#define KVM_CAP_VM_COPY_ENC_CONTEXT_FROM 197
#define KVM_CAP_PTP_KVM 198
-#define KVM_CAP_ARM_MTE 199
+#define KVM_CAP_HYPERV_ENFORCE_CPUID 199
+#define KVM_CAP_SREGS2 200
+#define KVM_CAP_EXIT_HYPERCALL 201
+#define KVM_CAP_PPC_RPT_INVALIDATE 202
+#define KVM_CAP_BINARY_STATS_FD 203
+#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204
++#define KVM_CAP_ARM_MTE 205
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-06-25 5:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 5:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 3:06 linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell
2023-03-31 2:26 Stephen Rothwell
2022-12-01 2:16 Stephen Rothwell
2022-12-01 15:23 ` Marc Zyngier
2022-12-01 1:09 Stephen Rothwell
2022-12-01 0:57 Stephen Rothwell
2022-12-01 0:36 Stephen Rothwell
2022-12-01 0:24 Stephen Rothwell
2022-07-18 5:19 Stephen Rothwell
2022-05-05 4:47 Stephen Rothwell
2021-12-17 4:19 Stephen Rothwell
2021-12-09 22:01 broonie
2021-06-25 5:24 Stephen Rothwell
2021-06-25 5:15 Stephen Rothwell
2021-06-23 5:53 Stephen Rothwell
2021-06-22 5:31 Stephen Rothwell
2021-04-22 4:43 Stephen Rothwell
2021-04-22 4:39 Stephen Rothwell
2020-07-13 4:40 Stephen Rothwell
2020-08-09 8:55 ` Stephen Rothwell
2020-07-13 4:39 Stephen Rothwell
2020-08-09 8:54 ` Stephen Rothwell
2020-03-25 3:23 Stephen Rothwell
2018-10-18 2:46 Stephen Rothwell
2017-04-10 3:52 Stephen Rothwell
2017-04-10 6:26 ` Christoffer Dall
2016-07-24 6:04 Stephen Rothwell
2016-07-24 5:59 Stephen Rothwell
2016-07-20 5:27 Stephen Rothwell
2015-10-16 3:53 Stephen Rothwell
2015-10-16 4:20 ` Wu, Feng
2014-11-26 6:19 Stephen Rothwell
2014-11-26 11:39 ` Christoffer Dall
2014-09-25 5:32 Stephen Rothwell
2014-09-18 3:52 Stephen Rothwell
2014-09-18 15:13 ` Marc Zyngier
2014-09-08 6:04 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=20210625152013.7e121403@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aaronlewis@google$(echo .)com \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=jingzhangos@google$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
--cc=steven.price@arm$(echo .)com \
/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