linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

From: Mark Brown

Date: Mon Nov 16 2026 - 10:05:13 EST


Hi all,

Today's linux-next merge of the vfs-brauner tree got conflicts in:

tools/testing/selftests/proc/.gitignore
tools/testing/selftests/proc/Makefile
tools/testing/selftests/proc/config

between commits:

f0e0ab5050ec5 ("selftests/proc: check that a faulting readlink() doesn't hold up removal")
47b64be3c6b5e ("selftests/proc: check that faulting sysctl accesses don't hold up removal")

from the vfs-brauner-fixes tree and commits:

9fad20fd1f32e ("selftests/proc: test which entries can't be mountpoints")
305f53d9e68b8 ("selftests/proc: check /proc/<pid> files across a set-user-ID exec")

from the vfs-brauner 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.

diff --cc tools/testing/selftests/proc/.gitignore
index 3fa89f46b9c7b,41f0103840c98..0000000000000
--- a/tools/testing/selftests/proc/.gitignore
+++ b/tools/testing/selftests/proc/.gitignore
@@@ -8,8 -8,8 +8,9 @@@
/proc-maps-race
/proc-multiple-procfs
/proc-net-dev-lseek
+/proc-readdir-churn
/proc-empty-vm
+ /proc-pid-setuid-exec
/proc-pid-vm
/proc-self-map-files-001
/proc-self-map-files-002
@@@ -21,8 -21,7 +22,9 @@@
/proc-uptime-001
/proc-uptime-002
/proc-pidns
+/proc-remove-slow-sysctl
+/proc-remove-slow-readlink
+ /proc-unmountable
/read
/self
/setns-dcache
diff --cc tools/testing/selftests/proc/Makefile
index df02699a3587b,a718c83c71a15..0000000000000
--- a/tools/testing/selftests/proc/Makefile
+++ b/tools/testing/selftests/proc/Makefile
@@@ -30,9 -29,8 +30,11 @@@ TEST_GEN_PROGS += setns-sysvip
TEST_GEN_PROGS += thread-self
TEST_GEN_PROGS += proc-multiple-procfs
TEST_GEN_PROGS += proc-fsconfig-hidepid
-TEST_GEN_PROGS += proc-pidns
-TEST_GEN_PROGS += proc-unmountable
+TEST_GEN_PROGS += proc-sysctl-readdir-churn
+ TEST_GEN_PROGS += proc-pid-setuid-exec
+TEST_GEN_PROGS += proc-pidns
+TEST_GEN_PROGS += proc-remove-slow-sysctl
+TEST_GEN_PROGS += proc-remove-slow-readlink
++TEST_GEN_PROGS += proc-unmountable

include ../lib.mk
diff --cc tools/testing/selftests/proc/config
index 1504a761b39bb,249cd78908da5..0000000000000
--- a/tools/testing/selftests/proc/config
+++ b/tools/testing/selftests/proc/config
@@@ -1,10 -1,3 +1,11 @@@
CONFIG_PROC_FS=y
-CONFIG_KSM=y
+CONFIG_NET_NS=y
+CONFIG_IPV6=y
+CONFIG_TUN=y
CONFIG_USERFAULTFD=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_DUMMY=m
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
++CONFIG_KSM=y

Attachment: signature.asc
Description: PGP signature