linux-next: manual merge of the efi tree with the arm-soc tree

linux-next: manual merge of the efi tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1180 bytes --]

Hi all,

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

  arch/arm/configs/milbeaut_m10v_defconfig

between commit:

  2002f3968714 ("ARM: refresh defconfig files")

from the arm-soc tree and commit:

  0f5b2c69a4cb ("efi: vars: Remove deprecated 'efivars' sysfs interface")

from the efi 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/arm/configs/milbeaut_m10v_defconfig
index 37739b61b0c3,9b4789af0201..000000000000
--- a/arch/arm/configs/milbeaut_m10v_defconfig
+++ b/arch/arm/configs/milbeaut_m10v_defconfig
@@@ -44,7 -44,7 +44,6 @@@ CONFIG_ARM_CPUIDLE=
  CONFIG_VFP=y
  CONFIG_NEON=y
  CONFIG_KERNEL_MODE_NEON=y
- CONFIG_EFI_VARS=m
 -CONFIG_EFI_CAPSULE_LOADER=m
  CONFIG_ARM_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM_NEON=m
  CONFIG_CRYPTO_SHA1_ARM_CE=m

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel