Merge tag 'fs_for_v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2022 00:38:15 +0000 (17:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2022 00:38:15 +0000 (17:38 -0700)
Pull reiserfs updates from Jan Kara:
 "The biggest change in this pull is the addition of a deprecation
  message about reiserfs with the outlook that we'd eventually be able
  to remove it from the kernel. Because it is practically unmaintained
  and untested and odd enough that people don't want to bother with it
  anymore...

  Otherwise there are small udf and ext2 fixes"

* tag 'fs_for_v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: remove redundant assignment of variable etype
  reiserfs: Deprecate reiserfs
  ext2: correct max file size computing
  reiserfs: get rid of AOP_FLAG_CONT_EXPAND flag

1  2 
fs/ext2/super.c
fs/reiserfs/inode.c
fs/reiserfs/super.c
fs/udf/super.c

diff --cc fs/ext2/super.c
Simple merge
Simple merge
Simple merge
diff --cc fs/udf/super.c
Simple merge