From: Mark Brown <broonie@kernel•org>
To: Catalin Marinas <catalin.marinas@arm•com>, Will Deacon <will@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marc Zyngier <maz@kernel•org>, Mark Brown <broonie@kernel•org>,
Mark Rutland <mark.rutland@arm•com>
Subject: linux-next: manual merge of the arm64 tree with the origin tree
Date: Thu, 4 Jun 2026 13:59:15 +0100 [thread overview]
Message-ID: <aiF2o4cf4wstWbxN@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1710 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kvm/hyp/include/hyp/switch.h
between commit:
8372633074898 ("KVM: arm64: Correctly cap ZCR_EL2 provided by a guest hypervisor")
from the origin tree and commits:
e1b163e405534 ("arm64: fpsimd: Use opaque type for SVE state")
2768101b39765 ("arm64: fpsimd: Move SVE save/restore inline")
1277531fca43d ("arm64: fpsimd: Split FPSR/FPCR from SVE save/restore")
from the arm64 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/arm64/kvm/hyp/include/hyp/switch.h
index 320cd45d49c5a,1f12c4ba295a4..0000000000000
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@@ -468,10 -466,9 +468,9 @@@ static inline void __hyp_sve_restore_gu
* The vCPU's saved SVE state layout always matches the max VL of the
* vCPU. Start off with the max VL so we can load the SVE state.
*/
- sve_cond_update_zcr_vq(vcpu_sve_max_vq(vcpu) - 1, SYS_ZCR_EL2);
+ sve_cond_update_zcr_vq(zcr_el2, SYS_ZCR_EL2);
- __sve_restore_state(vcpu_sve_pffr(vcpu),
- &vcpu->arch.ctxt.fp_regs.fpsr,
- true);
+ sve_load_state(kern_hyp_va(vcpu->arch.sve_state), true);
+ fpsimd_load_common(&vcpu->arch.ctxt.fp_regs);
/*
* The effective VL for a VM could differ from the max VL when running a
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-06-04 12:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 12:59 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 15:11 linux-next: manual merge of the arm64 tree with the origin tree Mark Brown
2026-01-26 15:23 ` Will Deacon
2026-01-26 15:53 ` Marc Zyngier
2026-01-26 16:08 ` Mark Brown
2026-01-26 15:39 ` Marc Zyngier
2026-01-26 22:49 ` Mark Brown
2025-09-23 8:25 Mark Brown
2025-09-23 8:36 ` Will Deacon
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=aiF2o4cf4wstWbxN@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=maz@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
/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