From: Linus Torvalds Date: Wed, 13 Dec 2023 19:09:58 +0000 (-0800) Subject: Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd;p=linux.git Merge tag 'pull-fixes' of git://git./linux/kernel/git/viro/vfs Pull ufs fix from Al Viro: "ufs got broken this merge window on folio conversion - calling conventions for filemap_lock_folio() are not the same as for find_lock_page()" * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix ufs_get_locked_folio() breakage --- 5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd