From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Jun 2023 00:10:27 +0000 (-0700)
Subject: Merge tag 'landlock-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic... 
X-Git-Tag: v6.6.17~4578
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26642864f8b212964f80fbd69685eb850ced5f45;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'landlock-6.5-rc1' of git://git./linux/kernel/git/mic/linux

Pull landlock updates from Mickaël Salaün:
 "Add support for Landlock to UML.

  To do this, this fixes the way hostfs manages inodes according to the
  underlying filesystem [1]. They are now properly handled as for other
  filesystems, which enables Landlock support (and probably other
  features).

  This also extends Landlock's tests with 6 pseudo filesystems,
  including hostfs"

[1] https://lore.kernel.org/all/20230612191430.339153-1-mic@digikod.net/

* tag 'landlock-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  selftests/landlock: Add hostfs tests
  selftests/landlock: Add tests for pseudo filesystems
  selftests/landlock: Make mounts configurable
  selftests/landlock: Add supports_filesystem() helper
  selftests/landlock: Don't create useless file layouts
  hostfs: Fix ephemeral inodes
---

26642864f8b212964f80fbd69685eb850ced5f45
diff --cc arch/um/Kconfig
index 887cfb6,4057d52..b5e1793
--- 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