Skip to content

Commit e9e9697

Browse files
committed
Merge tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve fix from Kees Cook: "This moves the exec and binfmt_elf tests out of your way and into the tests/ subdirectory, following the newly ratified KUnit naming conventions. :)" * tag 'execve-v6.11-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: execve: Move KUnit tests to tests/ subdirectory
2 parents 5ad7ff8 + b6f5ee4 commit e9e9697

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8354,7 +8354,8 @@ F: Documentation/userspace-api/ELF.rst
83548354
F: fs/*binfmt_*.c
83558355
F: fs/Kconfig.binfmt
83568356
F: fs/exec.c
8357-
F: fs/exec_test.c
8357+
F: fs/tests/binfmt_*_kunit.c
8358+
F: fs/tests/exec_kunit.c
83588359
F: include/linux/binfmts.h
83598360
F: include/linux/elf.h
83608361
F: include/uapi/linux/binfmts.h

fs/binfmt_elf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2150,5 +2150,5 @@ core_initcall(init_elf_binfmt);
21502150
module_exit(exit_elf_binfmt);
21512151

21522152
#ifdef CONFIG_BINFMT_ELF_KUNIT_TEST
2153-
#include "binfmt_elf_test.c"
2153+
#include "tests/binfmt_elf_kunit.c"
21542154
#endif

fs/exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2236,5 +2236,5 @@ fs_initcall(init_fs_exec_sysctls);
22362236
#endif /* CONFIG_SYSCTL */
22372237

22382238
#ifdef CONFIG_EXEC_KUNIT_TEST
2239-
#include "exec_test.c"
2239+
#include "tests/exec_kunit.c"
22402240
#endif
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)