summaryrefslogtreecommitdiff
path: root/fs/ext2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-05-25 19:24:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-05-25 19:24:06 -0700
commit8b728edc5be161799434cc17e1279db2f8eabe29 (patch)
tree756e64f2835f20a830ac041c70b748ce07754531 /fs/ext2
parent3f306ea2e18568f693f7763d1c2178f349ae8f31 (diff)
parent2999e1e387271b3216c44168b0c5cc69f647f155 (diff)
Merge tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
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
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/inode.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 9e1ecd89f47f..360ce3604a2d 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -36,7 +36,6 @@
#include <linux/iomap.h>
#include <linux/namei.h>
#include <linux/uio.h>
-#include <linux/dax.h>
#include "ext2.h"
#include "acl.h"
#include "xattr.h"