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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220725183257.670f4cd0@canb.auug.org.au>
Date:   Mon, 25 Jul 2022 18:32:57 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ard Biesheuvel <ardb@...nel.org>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the efi tree with the arm-soc tree

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

Content of type "application/pgp-signature" skipped