linux-kernel - linux-next: manual merge of the landlock tree with the tip 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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 20 Jun 2023 13:55:36 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mickaël Salaün <mic@...ikod.net>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     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 landlock tree with the tip tree

Hi all,

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

  arch/um/Kconfig

between commit:

  9349b5cd0908 ("um/cpu: Switch to arch_cpu_finalize_init()")

from the tip tree and commit:

  74ce793bcbde ("hostfs: Fix ephemeral inodes")

from the landlock 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/um/Kconfig
index 887cfb636c26,4057d5267c6a..000000000000
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -5,8 -5,6 +5,7 @@@ menu "UML-specific options
  config UML
  	bool
  	default y
- 	select ARCH_EPHEMERAL_INODES
 +	select ARCH_HAS_CPU_FINALIZE_INIT
  	select ARCH_HAS_FORTIFY_SOURCE
  	select ARCH_HAS_GCOV_PROFILE_ALL
  	select ARCH_HAS_KCOV

Content of type "application/pgp-signature" skipped