Subject: linux-next: manual merge of the arm64 tree with the arm64-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 28 Mar 2018 10:19:11 +1100

Hi all,

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

  arch/arm64/kernel/cpu_errata.c

between commit:

  e21da1c99200 ("arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery")

from the arm64-fixes tree and commit:

  c0cda3b8ee6b ("arm64: capabilities: Update prototype for enable call back")

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/kernel/cpu_errata.c
index b5a28336c077,4613e4d75c73..000000000000
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@@ -178,8 -196,8 +196,8 @@@ enable_smccc_arch_workaround_1(const st
  	case PSCI_CONDUIT_HVC:
  		arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
  				  ARM_SMCCC_ARCH_WORKAROUND_1, &res);
 -		if (res.a0)
 +		if ((int)res.a0 < 0)
- 			return 0;
+ 			return;
  		cb = call_hvc_arch_workaround_1;
  		smccc_start = __smccc_workaround_1_hvc_start;
  		smccc_end = __smccc_workaround_1_hvc_end;
@@@ -188,8 -206,8 +206,8 @@@
  	case PSCI_CONDUIT_SMC:
  		arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
  				  ARM_SMCCC_ARCH_WORKAROUND_1, &res);
 -		if (res.a0)
 +		if ((int)res.a0 < 0)
- 			return 0;
+ 			return;
  		cb = call_smc_arch_workaround_1;
  		smccc_start = __smccc_workaround_1_smc_start;
  		smccc_end = __smccc_workaround_1_smc_end;