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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jack Qiu <jack.qiu@huawei.com>, Jia Yang <jiayang5@huawei.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Yi Zhuang <zhuangyi1@huawei.com>
Subject: linux-next: manual merge of the vfs tree with the f2fs tree
Date: Mon, 19 Apr 2021 10:53:43 +1000	[thread overview]
Message-ID: <20210419105343.0323daf3@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/f2fs/namei.c

between commit:

  5f029c045c94 ("f2fs: clean up build warnings")

from the f2fs tree and commit:

  80e5d1ff5d5f ("useful constants: struct qstr for ".."")

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/f2fs/namei.c
index 405d85dbf9f1,377c6b161b23..000000000000

--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -416,10 -416,8 +416,9 @@@ out
  
  struct dentry *f2fs_get_parent(struct dentry *child)
  {
- 	struct qstr dotdot = QSTR_INIT("..", 2);
  	struct page *page;
- 	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot, &page);
+ 	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot_name, &page);
 +
  	if (!ino) {
  		if (IS_ERR(page))
  			return ERR_CAST(page);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
