From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <marc.zyngier@arm•com>,
Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paolo Bonzini <pbonzini@redhat•com>,
Will Deacon <will.deacon@arm•com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Mon, 8 Sep 2014 16:04:30 +1000 [thread overview]
Message-ID: <20140908160430.21c67797@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in
arch/arm64/include/asm/kvm_host.h between commit 656473003bc7 ("KVM:
forward declare structs in kvm_types.h") from the kvm tree and commit
6951e48bff0b ("KVM: ARM/arm64: fix non-const declaration of function
returning const") from the kvm-arm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm64/include/asm/kvm_host.h
index be9970a59497,50431d36732b..000000000000
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@@ -43,7 -41,8 +43,7 @@@
#define KVM_VCPU_MAX_FEATURES 3
- int kvm_target_cpu(void);
-struct kvm_vcpu;
+ int __attribute_const__ kvm_target_cpu(void);
int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
int kvm_arch_dev_ioctl_check_extension(long ext);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-08 6:04 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 6:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-18 3:52 linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell
2014-09-18 15:13 ` Marc Zyngier
2014-09-25 5:32 Stephen Rothwell
2014-11-26 6:19 Stephen Rothwell
2014-11-26 11:39 ` Christoffer Dall
2015-10-16 3:53 Stephen Rothwell
2015-10-16 4:20 ` Wu, Feng
2016-07-20 5:27 Stephen Rothwell
2016-07-24 5:59 Stephen Rothwell
2016-07-24 6:04 Stephen Rothwell
2017-04-10 3:52 Stephen Rothwell
2017-04-10 6:26 ` Christoffer Dall
2018-10-18 2:46 Stephen Rothwell
2020-03-25 3:23 Stephen Rothwell
2020-07-13 4:39 Stephen Rothwell
2020-08-09 8:54 ` Stephen Rothwell
2020-07-13 4:40 Stephen Rothwell
2020-08-09 8:55 ` Stephen Rothwell
2021-04-22 4:39 Stephen Rothwell
2021-04-22 4:43 Stephen Rothwell
2021-06-22 5:31 Stephen Rothwell
2021-06-23 5:53 Stephen Rothwell
2021-06-25 5:15 Stephen Rothwell
2021-06-25 5:20 Stephen Rothwell
2021-06-25 5:24 Stephen Rothwell
2021-12-09 22:01 broonie
2021-12-17 4:19 Stephen Rothwell
2022-05-05 4:47 Stephen Rothwell
2022-07-18 5:19 Stephen Rothwell
2022-12-01 0:24 Stephen Rothwell
2022-12-01 0:36 Stephen Rothwell
2022-12-01 0:57 Stephen Rothwell
2022-12-01 1:09 Stephen Rothwell
2022-12-01 2:16 Stephen Rothwell
2022-12-01 15:23 ` Marc Zyngier
2023-03-31 2:26 Stephen Rothwell
2023-04-06 3:06 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=20140908160430.21c67797@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=gleb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=mtosatti@redhat$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
--cc=will.deacon@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