linux-next: manual merge of the f2fs tree with the ext4 tree

2016-09-18 Thread Stephen Rothwell
Hi Jaegeuk, Today's linux-next merge of the f2fs tree got a conflict in: fs/f2fs/dir.c between commit: 59aa5a3aeead ("fscrypto: make filename crypto functions return 0 on success") from the ext4 tree and commit: e06f86e61d7a ("f2fs crypto: avoid unneeded memory allocation in

linux-next: manual merge of the f2fs tree with the ext4 tree

2016-09-18 Thread Stephen Rothwell
Hi Jaegeuk, Today's linux-next merge of the f2fs tree got a conflict in: fs/f2fs/dir.c between commit: 59aa5a3aeead ("fscrypto: make filename crypto functions return 0 on success") from the ext4 tree and commit: e06f86e61d7a ("f2fs crypto: avoid unneeded memory allocation in

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

2016-05-16 Thread Theodore Ts'o
On Mon, May 16, 2016 at 03:22:41PM -0700, Jaegeuk Kim wrote: > > Sorry, I just ran out of time to try to verify that the patch wouldn't > > break anything, and given that we're going to need to wait for > > "fscrypto/f2fs: allow fs-specific key prefix for fs encryption" to go > > upstream. > >

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

2016-05-16 Thread Theodore Ts'o
On Mon, May 16, 2016 at 03:22:41PM -0700, Jaegeuk Kim wrote: > > Sorry, I just ran out of time to try to verify that the patch wouldn't > > break anything, and given that we're going to need to wait for > > "fscrypto/f2fs: allow fs-specific key prefix for fs encryption" to go > > upstream. > >

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

2016-05-16 Thread Jaegeuk Kim
On Mon, May 16, 2016 at 05:30:28PM -0400, Theodore Ts'o wrote: > On Mon, May 09, 2016 at 10:15:03AM -0700, Jaegeuk Kim wrote: > > Hi Stephen, > > > > Thank you for the notice. > > I've been waiting for a comment about the below patch targeted to v4.7 from > > Ted. > > Meanwhile, I intended to

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

2016-05-16 Thread Jaegeuk Kim
On Mon, May 16, 2016 at 05:30:28PM -0400, Theodore Ts'o wrote: > On Mon, May 09, 2016 at 10:15:03AM -0700, Jaegeuk Kim wrote: > > Hi Stephen, > > > > Thank you for the notice. > > I've been waiting for a comment about the below patch targeted to v4.7 from > > Ted. > > Meanwhile, I intended to

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

2016-05-16 Thread Theodore Ts'o
On Mon, May 09, 2016 at 10:15:03AM -0700, Jaegeuk Kim wrote: > Hi Stephen, > > Thank you for the notice. > I've been waiting for a comment about the below patch targeted to v4.7 from > Ted. > Meanwhile, I intended to prepare -next for that patch in advance. > Surely, once I get a sense that I

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

2016-05-16 Thread Theodore Ts'o
On Mon, May 09, 2016 at 10:15:03AM -0700, Jaegeuk Kim wrote: > Hi Stephen, > > Thank you for the notice. > I've been waiting for a comment about the below patch targeted to v4.7 from > Ted. > Meanwhile, I intended to prepare -next for that patch in advance. > Surely, once I get a sense that I

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

2016-05-09 Thread Jaegeuk Kim
Hi Stephen, Thank you for the notice. I've been waiting for a comment about the below patch targeted to v4.7 from Ted. Meanwhile, I intended to prepare -next for that patch in advance. Surely, once I get a sense that I need to consider v4.8, I'll drop this patch for -next right away. Thanks, On

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

2016-05-09 Thread Jaegeuk Kim
Hi Stephen, Thank you for the notice. I've been waiting for a comment about the below patch targeted to v4.7 from Ted. Meanwhile, I intended to prepare -next for that patch in advance. Surely, once I get a sense that I need to consider v4.8, I'll drop this patch for -next right away. Thanks, On

linux-next: manual merge of the f2fs tree with the ext4 tree

2016-05-08 Thread Stephen Rothwell
Hi Jaegeuk, Today's linux-next merge of the f2fs tree got a conflict in: fs/ext4/ext4.h between commit: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages") from the ext4 tree and commit: a618a2a1dda4 ("ext4 crypto: migrate into vfs's crypto

linux-next: manual merge of the f2fs tree with the ext4 tree

2016-05-08 Thread Stephen Rothwell
Hi Jaegeuk, Today's linux-next merge of the f2fs tree got a conflict in: fs/ext4/ext4.h between commit: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages") from the ext4 tree and commit: a618a2a1dda4 ("ext4 crypto: migrate into vfs's crypto