[v1] linux-next: manual merge of the kvm-arm tree with the arm64 tree

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

Posted by Mark Brown 14 hours ago

Hi all,

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

  arch/arm64/tools/cpucaps

between commit:

  12aab25ca56ee ("arm64: errata: work around NVIDIA Olympus device store/load ordering")

from the arm64 tree and commit:

  27a263e1a0fa2 ("KVM: arm64: Move GICv3 broken SEIS implementation detection to a CPU errrata")

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.

diff --cc arch/arm64/tools/cpucaps
index e43c9095424bf,50373264ecde8..0000000000000
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@@ -121,7 -121,7 +121,8 @@@ WORKAROUND_CAVIUM_TX2_219_TV
  WORKAROUND_CLEAN_CACHE
  WORKAROUND_DEVICE_LOAD_ACQUIRE
  WORKAROUND_DISABLE_CNP
+ WORKAROUND_GICv3_BROKEN_SEIS
 +WORKAROUND_NVIDIA_OLYMPUS_1027
  WORKAROUND_PMUV3_IMPDEF_TRAPS
  WORKAROUND_QCOM_FALKOR_E1003
  WORKAROUND_QCOM_ORYON_CNTVOFF