linux-kernel - linux-next: manual merge of the ext4 tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20160321112928.1be53991@canb.auug.org.au>
Date:	Mon, 21 Mar 2016 11:29:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Theodore Ts'o <tytso@....edu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konstantin Khlebnikov <koct9i@...il.com>,
	Miklos Szeredi <miklos@...redi.hu>
Subject: linux-next: manual merge of the ext4 tree with Linus' tree

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,
  };