Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/Kconfig
index 66dc41fd49f23b6d67ed218690b49ef5bb1ac119,d719ea9c596d9f15026952cb123a90ff1fea19b8..27cfac56174548f0e191dd4e31cd02a7295e2b59
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1516,11 -1516,10 +1516,10 @@@ menu "ARMv8.3 architectural features
  config ARM64_PTR_AUTH
        bool "Enable support for pointer authentication"
        default y
-       depends on !KVM || ARM64_VHE
        depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC
 -      # GCC 9.1 and later inserts a .note.gnu.property section note for PAC
 +      # Modern compilers insert a .note.gnu.property section note for PAC
        # which is only understood by binutils starting with version 2.33.1.
 -      depends on !CC_IS_GCC || GCC_VERSION < 90100 || LD_VERSION >= 233010000
 +      depends on LD_IS_LLD || LD_VERSION >= 233010000 || (CC_IS_GCC && GCC_VERSION < 90100)
        depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE
        depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS)
        help

diff --cc arch/arm64/kvm/hyp/nvhe/hyp-init.S
Simple merge

diff --cc arch/arm64/kvm/reset.c
Simple merge