From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Eric Biggers <ebiggers@google.com>
Subject: Re: linux-next: manual merge of the f2fs tree with the vfs-fixes tree
Date: Mon, 14 May 2018 01:36:59 +0100 [thread overview]
Message-ID: <20180514003659.GA30522@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20180514102624.76a4097e@canb.auug.org.au>
On Mon, May 14, 2018 at 10:26:24AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the f2fs tree got a conflict in:
>
> fs/f2fs/namei.c
>
> between commit:
>
> 1e2e547a93a0 ("do d_instantiate/unlock_new_inode combinations safely")
>
> from the vfs-fixes tree and commit:
>
> ab3835aae642 ("f2fs: call unlock_new_inode() before d_instantiate()")
>
> from the f2fs tree.
>
> I think that the vfs-fixes commit supercedes the f2fs tree one, so I
> used that.
Yes, it does.
prev parent reply other threads:[~2018-05-14 0:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 0:26 linux-next: manual merge of the f2fs tree with the vfs-fixes tree Stephen Rothwell
2018-05-14 0:36 ` Al Viro [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180514003659.GA30522@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=ebiggers@google.com \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox