On Sat, 22 Mar 2025 at 03:13, Christian Brauner <brauner@xxxxxxxxxx> wrote:
>
> Merge conflicts with mainline
> =============================
>
> This contains a minor merge conflict for include/linux/fs.h.
Hmm. My resolution here was to just take the plain VFS_WARN_ON_INODE()
side, which basically drops commit 37d11cfc6360 ("vfs: sanity check
the length passed to inode_set_cached_link()") entirely, because that
one had a "TODO" that implies it's now replaced by the new
VFS_WARN_ON_INODE() interface.
This is just a note to make sure that if anybody was expecting
something else, you can now speak up and say "can you please do X".
Or, better yet, send a patch.
Linus
