From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751935AbcCUA3f (ORCPT ); Sun, 20 Mar 2016 20:29:35 -0400 Received: from ozlabs.org ([103.22.144.67]:38720 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbcCUA3c (ORCPT ); Sun, 20 Mar 2016 20:29:32 -0400 Date: Mon, 21 Mar 2016 11:29:28 +1100 From: Stephen Rothwell To: "Theodore Ts'o" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Konstantin Khlebnikov , Miklos Szeredi Subject: linux-next: manual merge of the ext4 tree with Linus' tree Message-ID: <20160321112928.1be53991@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 Theodore, Today's linux-next merge of the ext4 tree got a conflict in: fs/overlayfs/super.c between commit: b5891cfab08f ("ovl: fix working on distributed fs as lower layer") from Linus' tree and commit: a7f7fb45f728 ("vfs: add file_dentry()") from the ext4 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/overlayfs/super.c index 619ad4b016d2,10dbdc7da69d..000000000000 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@@ -343,7 -356,7 +358,8 @@@ static const struct dentry_operations o static const struct dentry_operations ovl_reval_dentry_operations = { .d_release = ovl_dentry_release, + .d_select_inode = ovl_d_select_inode, + .d_native_dentry = ovl_d_native_dentry, .d_revalidate = ovl_dentry_revalidate, .d_weak_revalidate = ovl_dentry_weak_revalidate, };