]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'fixes_for_v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jul 2021 17:38:38 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jul 2021 17:38:38 +0000 (10:38 -0700)
Pull ext2 and reiserfs fixes from Jan Kara:
 "A fix for the ext2 conversion to kmap_local() and two reiserfs
  hardening fixes"

* tag 'fixes_for_v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: check directory items on read from disk
  fs/ext2: Avoid page_address on pages returned by ext2_get_page
  reiserfs: add check for root_inode in reiserfs_fill_super


Trivial merge