From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751846AbdB0IaP convert rfc822-to-8bit (ORCPT ); Mon, 27 Feb 2017 03:30:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54710 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbdB0IaN (ORCPT ); Mon, 27 Feb 2017 03:30:13 -0500 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20170227110553.0bb24b02@canb.auug.org.au> References: <20170227110553.0bb24b02@canb.auug.org.au> To: Stephen Rothwell Cc: dhowells@redhat.com, Al Viro , Jaegeuk Kim , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, DongOh Shin Subject: Re: linux-next: manual merge of the vfs tree with the f2fs tree MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <30395.1488184068.1@warthog.procyon.org.uk> Content-Transfer-Encoding: 8BIT Date: Mon, 27 Feb 2017 08:27:48 +0000 Message-ID: <30396.1488184068@warthog.procyon.org.uk> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 27 Feb 2017 08:27:52 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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