linux-kernel - linux-next: manual merge of the kvm-arm tree with the arm64 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250317172102.55f7c4d9@canb.auug.org.au>
Date: Mon, 17 Mar 2025 17:21:02 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christoffer Dall <cdall@...columbia.edu>, Marc Zyngier <maz@...nel.org>,
 Catalin Marinas <catalin.marinas@....com>, Will Deacon <will@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Mark Rutland
 <mark.rutland@....com>, Oliver Upton <oliver.upton@...ux.dev>, Shameer
 Kolothum <shameerali.kolothum.thodi@...wei.com>
Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm64/kvm/hypercalls.c

between commit:

  d2c173acbf93 ("KVM: arm64: expose SMCCC_ARCH_WORKAROUND_4 to guests")

from the arm64 tree and commit:

  c0000e58c74e ("KVM: arm64: Introduce KVM_REG_ARM_VENDOR_HYP_BMAP_2")

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/hypercalls.c
index 876e6f29a73e,569941eeb3fe..000000000000
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@@ -397,7 -391,7 +401,8 @@@ static const u64 kvm_arm_fw_reg_ids[] 
  	KVM_REG_ARM_STD_BMAP,
  	KVM_REG_ARM_STD_HYP_BMAP,
  	KVM_REG_ARM_VENDOR_HYP_BMAP,
+ 	KVM_REG_ARM_VENDOR_HYP_BMAP_2,
 +	KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_4,
  };
  
  void kvm_arm_init_hypercalls(struct kvm *kvm)

Content of type "application/pgp-signature" skipped