From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v6.7-rc6~24
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd

Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/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