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

[Mark Brown]

Hi all,

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

  arch/arm64/tools/cpucaps

between commits:

  94104e3cfa803 ("arm64: cpufeature: Rename BBML2_NOABORT as BBML3")
  12aab25ca56ee ("arm64: errata: work around NVIDIA Olympus device store/load ordering")

from the arm64 tree and commits:

  27a263e1a0fa2 ("KVM: arm64: Move GICv3 broken SEIS implementation detection to a CPU errrata")
  0dbb49dcdbbe9 ("arm64: Add ARM64_HAS_NV2P1 capability")
  5be1b8de27dce ("arm64: Add ARM64_HAS_NV3 capability")

from the kvm-arm tree.  (Only the arm64 tree touches this file one of
the other commits says!)

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 0ee42b0cc8d34,f88d7898489f9..0000000000000
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@@ -52,6 -51,9 +52,8 @@@ HAS_LS64_
  HAS_LSUI
  HAS_MOPS
  HAS_NESTED_VIRT
+ HAS_NV2P1
+ HAS_NV3
 -HAS_BBML2_NOABORT
  HAS_PAN
  HAS_PMUV3
  HAS_S1PIE
@@@ -121,7 -123,7 +123,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

Attachment: signature.asc
Description: PGP signature