Re: linux-next: manual merge of the f2fs tree with the fscrypt tree

2020-08-09 Thread Stephen Rothwell
Hi all, On Wed, 8 Jul 2020 10:38:58 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the f2fs tree got a conflict in: > > Documentation/filesystems/f2fs.rst > > between commit: > > 38dff4e50c12 ("f2fs: add inline encryption support") > > from the fscrypt tree and commit: >

Re: linux-next: manual merge of the f2fs tree with the fscrypt tree

2019-01-01 Thread Chandan Rajendra
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 > wrote: > > > > Today's linux-next merge of the f2fs tree got a conflict in: > > > > fs/f2fs/dir.c > > > > between commit: > > > > 848a010287e6 ("f2fs: u

Re: linux-next: manual merge of the f2fs tree with the fscrypt tree

2019-01-01 Thread Stephen Rothwell
Hi all, On Tue, 11 Dec 2018 10:13:22 +1100 Stephen Rothwell 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: > >