Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Dec 2023 19:09:58 +0000 (11:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Dec 2023 19:09:58 +0000 (11:09 -0800)
commit5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd
tree570df1a3109d97b5b15b7e1a781095283f3335d7
parentaf2a9c6a83a61bcaeb0fa4edc74762448926ef1c
parent485053bb81c81a122edd982b263277e65d7485c5
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