From: Chandan Rajendra <chandan@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Chandan Rajendra <chandan@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the f2fs tree with the fscrypt tree
Date: Wed, 02 Jan 2019 10:26:09 +0530 [thread overview]
Message-ID: <2265186.H1UptfE7Oa@localhost.localdomain> (raw)
In-Reply-To: <20190102112610.3bc5fb97@canb.auug.org.au>
On Wednesday, January 2, 2019 5:56:10 AM IST Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 11 Dec 2018 10:13:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the f2fs tree got a conflict in:
> >
> > fs/f2fs/dir.c
> >
> > between commit:
> >
> > 848a010287e6 ("f2fs: use IS_ENCRYPTED() to check encryption status")
> >
> > from the fscrypt tree and commit:
> >
> > 4e240d1bab1e ("f2fs: check memory boundary by insane namelen")
> >
> > from the f2fs 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.
> >
>
> This is now a conflict between the fscrypt tree and Linus' tree.
>
>
fscrypt's master branch has fsverity patches applied. These are not available
on Linus' tree. Hence the conflict.
Just FYI, The discussion on merging fsverity into mainline kernel is still
going on.
--
chandan
next prev parent reply other threads:[~2019-01-02 4:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 23:13 linux-next: manual merge of the f2fs tree with the fscrypt tree Stephen Rothwell
2019-01-02 0:26 ` Stephen Rothwell
2019-01-02 4:56 ` Chandan Rajendra [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 0:38 Stephen Rothwell
2020-08-09 8:44 ` Stephen Rothwell
2020-05-21 0:30 Stephen Rothwell
2018-01-14 22:17 Stephen Rothwell
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=2265186.H1UptfE7Oa@localhost.localdomain \
--to=chandan@linux.ibm.com \
--cc=chandan@linux.vnet.ibm.com \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/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).