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

2020-05-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the ext4 tree got a conflict in: fs/ext4/super.c between commit: ed318a6cc0b6 ("fscrypt: support test_dummy_encryption=v2") from the fscrypt tree and commit: e0198aff3ae3 ("ext4: reject mount options not supported when remounting in handle_mount_opt(

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

2019-08-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the ext4 tree got a conflict in: fs/ext4/ioctl.c between commit: 29b3692e6dbf ("ext4: wire up new fscrypt ioctls") from the fscrypt tree and commits: b0c013e2928d ("ext4: add a new ioctl EXT4_IOC_CLEAR_ES_CACHE") 1ad3ea6e0a69 ("ext4: add a new ioctl

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

2017-11-12 Thread Stephen Rothwell
Hi all, On Mon, 30 Oct 2017 14:48:04 + Mark Brown wrote: > > Today's linux-next merge of the ext4 tree got a conflict in: > > fs/ext4/inode.c > > between commit: > > 2ee6a576be564272 ("fs, fscrypt: add an S_ENCRYPTED inode flag") > > from the fscrypt tree and commit: > > d4e50e6d43

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

2017-10-30 Thread Mark Brown
Hi Theodore, Today's linux-next merge of the ext4 tree got a conflict in: fs/ext4/inode.c between commit: 2ee6a576be564272 ("fs, fscrypt: add an S_ENCRYPTED inode flag") from the fscrypt tree and commit: d4e50e6d43b2620f ("ext4: add ext4_should_use_dax()") from the ext4 tree. I fixed