From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751348AbdB0AR5 (ORCPT ); Sun, 26 Feb 2017 19:17:57 -0500 Received: from ozlabs.org ([103.22.144.67]:35079 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751118AbdB0ARz (ORCPT ); Sun, 26 Feb 2017 19:17:55 -0500 Date: Mon, 27 Feb 2017 11:10:57 +1100 From: Stephen Rothwell To: Al Viro Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , "Eric W. Biederman" Subject: linux-next: manual merge of the vfs tree with Linus' tree Message-ID: <20170227111057.5691f927@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/proc/base.c between commit: 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces") from Linus' tree and commit: caffc373c573 ("statx: Add a system call to make enhanced file info available") from the vfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/proc/base.c index b8f06273353e,b5a5d3cab358..000000000000 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@@ -1724,11 -1711,13 +1724,12 @@@ out_unlock return NULL; } - int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) + int pid_getattr(const struct path *path, struct kstat *stat, + u32 request_mask, unsigned int query_flags) { - struct inode *inode = d_inode(dentry); + struct inode *inode = d_inode(path->dentry); struct task_struct *task; - struct pid_namespace *pid = dentry->d_sb->s_fs_info; - const struct cred *cred; + struct pid_namespace *pid = path->dentry->d_sb->s_fs_info; generic_fillattr(inode, stat);