From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel.org>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Eric Biggers <ebiggers@google.com>
Subject: linux-next: manual merge of the f2fs tree with the vfs-fixes tree
Date: Mon, 14 May 2018 10:26:24 +1000 [thread overview]
Message-ID: <20180514102624.76a4097e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
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.
I fixed it up (see above) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-05-14 0:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 0:26 Stephen Rothwell [this message]
2018-05-14 0:36 ` linux-next: manual merge of the f2fs tree with the vfs-fixes tree Al Viro
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=20180514102624.76a4097e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ebiggers@google.com \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).