From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel.org>, Theodore Ts'o <tytso@mit.edu>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Eric Biggers <ebiggers@google.com>, Chao Yu <yuchao0@huawei.com>
Subject: linux-next: manual merge of the f2fs tree with the fscrypt tree
Date: Mon, 15 Jan 2018 09:17:25 +1100 [thread overview]
Message-ID: <20180115091725.07d517a1@canb.auug.org.au> (raw)
Hi Jaegeuk,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/namei.c
between commit:
393c038f5c55 ("f2fs: switch to fscrypt ->symlink() helper functions")
from the fscrypt tree and commit:
acbf054d537d ("f2fs: inject fault to kzalloc")
from the f2fs tree.
I fixed it up (I just dropped the change to this file from the latter
commit) 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
next reply other threads:[~2018-01-14 22:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-14 22:17 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 0:38 linux-next: manual merge of the f2fs tree with the fscrypt tree Stephen Rothwell
2020-08-09 8:44 ` Stephen Rothwell
2020-05-21 0:30 Stephen Rothwell
2018-12-10 23:13 Stephen Rothwell
2019-01-02 0:26 ` Stephen Rothwell
2019-01-02 4:56 ` Chandan Rajendra
2017-05-03 23:40 Stephen Rothwell
2017-02-14 22:51 Stephen Rothwell
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=20180115091725.07d517a1@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=tytso@mit.edu \
--cc=yuchao0@huawei.com \
/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).