Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/cpucaps.h
between commit:
20109a859a9b ("arm64: kernel: disable CNP on Carmel")
from Linus' tree and commit:
18107f8a2df6 ("arm64: Support execute-only permissions with Enhanced PAN")
from the arm64 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/include/asm/cpucaps.h
index c40f2490cd7b,9e3ec4dd56d8..000000000000
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -66,8 -66,8 +66,9 @@@
#define ARM64_WORKAROUND_1508412 58
#define ARM64_HAS_LDAPR 59
#define ARM64_KVM_PROTECTED_MODE 60
-#define ARM64_HAS_EPAN 61
+#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP 61
++#define ARM64_HAS_EPAN 62
--#define ARM64_NCAPS 62
++#define ARM64_NCAPS 63
#endif /* __ASM_CPUCAPS_H */
On Mon, Mar 29, 2021 at 09:29:40AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/cpucaps.h
> index c40f2490cd7b,9e3ec4dd56d8..000000000000
> --- a/arch/arm64/include/asm/cpucaps.h
> +++ b/arch/arm64/include/asm/cpucaps.h
> @@@ -66,8 -66,8 +66,9 @@@
> #define ARM64_WORKAROUND_1508412 58
> #define ARM64_HAS_LDAPR 59
> #define ARM64_KVM_PROTECTED_MODE 60
> -#define ARM64_HAS_EPAN 61
> +#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP 61
> ++#define ARM64_HAS_EPAN 62
>
> --#define ARM64_NCAPS 62
> ++#define ARM64_NCAPS 63
>
> #endif /* __ASM_CPUCAPS_H */
Thanks Stephen, it looks fine.
--
Catalin