From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>, Marc Zyngier <maz@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Oliver Upton <oupton@kernel•org>,
Sascha Bischoff <Sascha.Bischoff@arm•com>
Subject: linux-next: manual merge of the kvm-arm tree with Linus' tree
Date: Thu, 13 Nov 2025 11:37:46 +1100 [thread overview]
Message-ID: <20251113113746.01737ec0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm64/kvm/vgic/vgic-v3.c
between commit:
da888524c393 ("KVM: arm64: vgic-v3: Trap all if no in-kernel irqchip")
from Linus' tree and commit:
ca30799f7c2d ("KVM: arm64: Turn vgic-v3 errata traps into a patched-in constant")
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 arch/arm64/kvm/vgic/vgic-v3.c
index 2f75ef14d339,32654ea51418..000000000000
--- a/arch/arm64/kvm/vgic/vgic-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-v3.c
@@@ -301,21 -504,9 +504,10 @@@ void vcpu_set_ich_hcr(struct kvm_vcpu *
return;
/* Hide GICv3 sysreg if necessary */
- if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2)
+ if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2 ||
- !irqchip_in_kernel(vcpu->kvm)) {
++ !irqchip_in_kernel(vcpu->kvm))
vgic_v3->vgic_hcr |= (ICH_HCR_EL2_TALL0 | ICH_HCR_EL2_TALL1 |
ICH_HCR_EL2_TC);
- return;
- }
-
- if (group0_trap)
- vgic_v3->vgic_hcr |= ICH_HCR_EL2_TALL0;
- if (group1_trap)
- vgic_v3->vgic_hcr |= ICH_HCR_EL2_TALL1;
- if (common_trap)
- vgic_v3->vgic_hcr |= ICH_HCR_EL2_TC;
- if (dir_trap)
- vgic_v3->vgic_hcr |= ICH_HCR_EL2_TDIR;
}
int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-13 0:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-13 0:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-05 4:34 linux-next: manual merge of the kvm-arm tree with Linus' tree Stephen Rothwell
2018-01-03 2:38 Stephen Rothwell
2018-01-03 9:50 ` Christoffer Dall
2017-11-06 2:56 Stephen Rothwell
2017-11-06 2:52 Stephen Rothwell
2017-04-10 4:02 Stephen Rothwell
2017-04-10 8:02 ` Christoffer Dall
2015-03-18 3:41 Stephen Rothwell
2015-03-18 7:55 ` Christoffer Dall
2015-04-07 16:20 ` Paolo Bonzini
2015-04-08 8:15 ` Marc Zyngier
2015-04-08 10:57 ` Christoffer Dall
2015-04-16 19:10 ` Christoffer Dall
2015-04-16 19:39 ` Paolo Bonzini
2015-04-16 20:16 ` Christoffer Dall
2014-10-17 1:47 Stephen Rothwell
2014-07-31 6:30 Stephen Rothwell
2014-07-31 12:10 ` Marc Zyngier
[not found] ` <CAEDV+gJ1oSPzgZMO=kdFDNPnzy-EOHGuLxHqTB8KO6d_8yPrxQ@mail.gmail.com>
2014-07-31 12:15 ` Marc Zyngier
2014-07-31 14:23 ` Christoffer Dall
2014-07-31 14:30 ` Marc Zyngier
2014-08-01 5:21 ` Stephen Rothwell
2014-07-31 12:17 ` Stephen Rothwell
2014-07-31 12:41 ` 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=20251113113746.01737ec0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Sascha.Bischoff@arm$(echo .)com \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=oupton@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