Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/namei.c
between commit:
5f029c045c94 ("f2fs: clean up build warnings")
from the f2fs tree and commit:
80e5d1ff5d5f ("useful constants: struct qstr for ".."")
from the vfs tree.
I fixed it up (see below) and ca
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/super.c
between commit:
f80f781514ef ("f2fs: checkpoint disabling")
from the f2fs tree and commit:
307c6e5241b4 ("vfs: Require specification of size of mount data for internal
mounts")
from the vfs tree.
I fix
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/super.c
between commit:
ea6767337f86 ("f2fs: support quota sys files")
from the f2fs tree and commit:
c2c6773f9942 ("VFS: Roll out mount flag differentiation (MS_* -> SB_*)
generally")
from the vfs tree.
I fix
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/checkpoint.c
between commits:
1f227a3e215d ("f2fs: stop all the operations by cp_error flag")
ea6767337f86 ("f2fs: support quota sys files")
from the f2fs tree and commit:
c2c6773f9942 ("VFS: Roll out mount fla
Stephen Rothwell wrote:
> ++int f2fs_getattr(const struct path *path, struct kstat *stat, u32
> request_mask,
> ++ unsigned int query_flags);
This looks correct. I see someone replaced all the function declarations with
ones with named arguments, hence the collision.
David
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/f2fs.h
between commit:
cac5a3d8f517 ("f2fs: fix 446 coding style warnings in f2fs.h")
from the f2fs tree and commit:
caffc373c573 ("statx: Add a system call to make enhanced file info available")
from the vfs t
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in:
fs/f2fs/dir.c
fs/f2fs/f2fs.h
between commit:
91246c21b859 ("f2fs: fix to report error number of f2fs_find_entry")
from the f2fs tree and commit:
14bffd7c398a ("qstr: constify instances in f2fs")
from the vfs tree.
I f
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/f2fs/data.c
between commit:
6bfc49197eba ("f2fs: issue cache flush on direct IO")
from the f2fs tree and commit:
c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
from the vfs tree.
I fixed it
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/f2fs/namei.c between commit 04002bddf33a ("f2fs: fix wrong error hanlder in
f2fs_follow_link") from the f2fs tree and commits
32a09a012611 ("new ->follow_link() and ->put_link() calling
conventions") and e1a9e9dd8594 ("don't pas
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/f2fs/f2fs.h between commit 510022a85839 ("f2fs: add F2FS_INLINE_DOTS
to recover missing dot dentries") from the f2fs tree and commit
5dd3dc06371a ("VFS: normal filesystems (and lustre): d_inode()
annotations") from the vfs tree.
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/f2fs/data.c between commit b6fe5873cb42 ("f2fs: fix to recover data
written by dio") from the f2fs tree and commits d8d3d94b80aa ("pass
iov_iter to ->direct_IO()") and 31b140398ce5 ("switch
{__,}blockdev_direct_IO() to iov_iter")
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/f2fs/file.c
between commit adeb670f1fee ("f2fs: introduce f2fs_seek_block to support
SEEK_{DATA, HOLE} in llseek") from the f2fs tree and commits 8eb02141b8a6
("switch simple generic_file_aio_read() users to ->read_iter()") and
e
12 matches
Mail list logo
