summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-28 03:10:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-28 03:10:27 +0300
commit26642864f8b212964f80fbd69685eb850ced5f45 (patch)
tree1f5928998519b5f8a0ce909ebdd8d92b4236291c /arch/um
parent6e2332e0ab532eb01f1fde39080dbfa9bf65c4cf (diff)
parent35ca4239929737bdc021ee923f97ebe7aff8fcc4 (diff)
downloadlinux-26642864f8b212964f80fbd69685eb850ced5f45.tar.xz
Merge tag 'landlock-6.5-rc1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 887cfb636c26..b5e179360534 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -5,7 +5,6 @@ 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