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

From: David Howells <[email-masked]>
Date: Mon, 27 Feb 2017 08:27:48 +0000

Stephen Rothwell <[email-masked]> 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