Re: linux-next: manual merge of the vfs tree with the f2fs tree

[David Howells]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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