linux-next: build failure after merge of the vfs-brauner tree
Subsystems (2)
Mark Brown
maintainerHi all,
After merging the vfs-brauner tree, today's linux-next build (arm64 kselftest) failed like this:
statmount_test.c:36:26: error: conflicting types for 'statmount_alloc'; have 'struct statmount *(uint64_t, int, uint64_t, unsigned int)' {aka 'struct statmount *(long unsigned int, int, long unsigned int, unsigned int)'}
36 | static struct statmount *statmount_alloc(uint64_t mnt_id, int fd, uint64_t mask, unsigned int flags)
| ^~~~~~~~~~~~~~~
In file included from statmount_test.c:15:
statmount.h:91:33: note: previous definition of 'statmount_alloc' with type 'struct statmount *(uint64_t, uint64_t, uint64_t)' {aka 'struct statmount *(long unsigned int, long unsigned int, long unsigned int)'}
91 | static inline struct statmount *statmount_alloc(uint64_t mnt_id, uint64_t mnt_ns_id, uint64_t mask)
| ^~~~~~~~~~~~~~~Caused by commit
c76a572bb04ed (selftests/statmount: add statmount_alloc() helper)
I have used the tree from 20260626 instead.
Mark Brown
maintainerQuoted 4 lines · Mark Brown
Hi all,
After merging the vfs-brauner tree, today's linux-next build (arm64 kselftest) failed like this:
This issue is still present in today's -next.
Mark Brown
maintainerQuoted 7 lines · Mark Brown
Quoted 4 lines · Mark Brown
Hi all,
After merging the vfs-brauner tree, today's linux-next build (arm64 kselftest) failed like this:
This issue is still present in today's -next.
This means that vfs-brauner is still held at the version from next-20260126 and none of the below commits have been in -next:
Amir Goldstein (4):
fs: add helpers name_is_dot{,dot,_dotdot}
ovl: use name_is_dot* helpers in readdir code
exportfs: clarify the documentation of open()/permission() expotrfs ops
nfsd: do not allow exporting of special kernel filesystems
Andrey Albershteyn (3):
fs: reset read-only fsflags together with xflags
fs: add FS_XFLAG_VERITY for fs-verity files
fsverity: add tracepoints
Chelsy Ratnawat (1):
fs: dcache: fix typo in enum d_walk_ret comment
Christian Brauner (6):
mount: start iterating from start of rbtree
mount: simplify __do_loopback()
mount: add FSMOUNT_NAMESPACE
tools: update mount.h header selftests/statmount: add statmount_alloc() helper
selftests: add FSMOUNT_NAMESPACE tests
Joanne Koong (1):
iomap: fix invalid folio access after folio_end_read()
Qiliang Yuan (1):
fs/file: optimize close_range() complexity from O(N) to O(Sparse)
Qing Wang (1):
ovl: Fix uninit-value in ovl_fill_real
Tamir Duberstein (1):
rust: seq_file: replace kernel::c_str! with C-Strings
Christian Brauner
maintainerQuoted 11 lines · Mark Brown
Quoted 7 lines · Mark Brown
Quoted 4 lines · Mark Brown
Hi all,
After merging the vfs-brauner tree, today's linux-next build (arm64 kselftest) failed like this:
This issue is still present in today's -next.
This means that vfs-brauner is still held at the version from next-20260126 and none of the below commits have been in -next:
This should've been fixed. Not sure what happened. I've reassembled vfs.all completely just to be sure.
Quoted 35 lines
Amir Goldstein (4):
fs: add helpers name_is_dot{,dot,_dotdot}
ovl: use name_is_dot* helpers in readdir code
exportfs: clarify the documentation of open()/permission() expotrfs ops
nfsd: do not allow exporting of special kernel filesystemsAndrey Albershteyn (3):
fs: reset read-only fsflags together with xflags
fs: addFS_XFLAG_VERITYfor fs-verity files
fsverity: add tracepointsChelsy Ratnawat (1):
fs: dcache: fix typo in enumd_walk_retcommentChristian Brauner (6):
mount: start iterating from start of rbtree
mount: simplify__do_loopback()
mount: addFSMOUNT_NAMESPACE
tools: updatemount.hheader selftests/statmount: addstatmount_alloc()helper
selftests: addFSMOUNT_NAMESPACEtestsJoanne Koong (1):
iomap: fix invalid folio access afterfolio_end_read()Qiliang Yuan (1):
fs/file: optimizeclose_range()complexity from O(N) to O(Sparse)Qing Wang (1):
ovl: Fix uninit-value inovl_fill_realTamir Duberstein (1):
rust:seq_file: replacekernel::c_str!with C-Strings
Mark Brown
maintainerQuoted 7 lines · Christian Brauner
Quoted 2 lines · Mark Brown
This means that vfs-brauner is still held at the version from next-20260126 and none of the below commits have been in -next:
This should've been fixed. Not sure what happened. I've reassembled vfs.all completely just to be sure.
I am seeing an updated version (I've currently got commit 91dfa1c939f479938d83793389ad7cb9c1faa4de dated 7th Feb) but I'm still seeing the same build failure:
CC statmount_test
statmount_test.c:36:26: error: conflicting types for 'statmount_alloc'; have 'struct statmount *(uint64_t, int, uint64_t, unsigned int)' {aka 'struct statmount *(long unsigned int, int, long unsigned int, unsigned int)'}
36 | static struct statmount *statmount_alloc(uint64_t mnt_id, int fd, uint64_t mask, unsigned int flags)
| ^~~~~~~~~~~~~~~
In file included from statmount_test.c:15:
statmount.h:91:33: note: previous definition of 'statmount_alloc' with type 'struct statmount *(uint64_t, uint64_t, uint64_t)' {aka 'struct statmount *(long unsigned int, long unsigned int, long unsigned int)'}
91 | static inline struct statmount *statmount_alloc(uint64_t mnt_id, uint64_t mnt_ns_id, uint64_t mask)
| ^~~~~~~~~~~~~~~Al Viro
maintainerQuoted 13 lines · Mark Brown
Quoted 7 lines · Christian Brauner
Quoted 2 lines · Mark Brown
This means that vfs-brauner is still held at the version from next-20260126 and none of the below commits have been in -next:
This should've been fixed. Not sure what happened. I've reassembled vfs.all completely just to be sure.
I am seeing an updated version (I've currently got commit
91dfa1c939f479938d83793389ad7cb9c1faa4dedated 7th Feb) but I'm still seeing the same build failure:
Quoted 8 lines
CC
statmount_test
statmount_test.c:36:26: error: conflicting types for 'statmount_alloc'; have 'struct statmount *(uint64_t, int,uint64_t, unsigned int)' {aka 'struct statmount *(long unsigned int, int, long unsigned int, unsigned int)'}
36 | static struct statmount *statmount_alloc(uint64_tmnt_id, int fd,uint64_tmask, unsigned int flags)| ^~~~~~~~~~~~~~~ In file included from statmount_test.c:15: statmount.h:91:33: note: previous definition of 'statmount_alloc' with type 'struct statmount *(uint64_t, uint64_t, uint64_t)' {aka 'struct statmount *(long unsigned int, long unsigned int, long unsigned int)'} 91 | static inline struct statmount *statmount_alloc(uint64_t mnt_id, uint64_t mnt_ns_id, uint64_t mask) | ^~~~~~~~~~~~~~~
c76a572bb04ed ("selftests/statmount: add statmount_alloc() helper") vs. the existing function of the same name in mainline tools/testing/selftests/filesystems/statmount/statmount_test.c
and something's fishy with the commit graph topology there - you start at 1bce1a664ac2 (== vfs-7.0.namespace), then there's a linear series from that to 30d2122405f2 *and*
commit d4b4bcc4d5e74a18920876337e74c1351e3c9dd7
Merge: 1bce1a664ac2 30d2122405f2
IOW, a merge that should've been a fast-forward...
Problem commit sits in that series. Past that odd merge it gets merged into your vfs.all in d433753e4867 ("Merge branch 'deferred.namespace-7.0' into vfs.all"). And aforementioned deferred.namespace-7.0 is not among the branches in the repository on kernel.org, so at a guess that's Christian's internal-only branch that leaked into vfs.all...