]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 02:24:06 +0000 (19:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 02:24:06 +0000 (19:24 -0700)
Pull writeback and ext2 cleanups from Jan Kara:
 "One small ext2 cleanup and one writeback spelling fix"

* tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  writeback: fix typo in comment
  fs: ext2: Fix duplicate included linux/dax.h

1  2 
fs/ext2/inode.c
fs/fs-writeback.c

diff --cc fs/ext2/inode.c
Simple merge
Simple merge