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

Hi all, On Fri, 3 May 2019 11:09:51 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/ext4/super.c > fs/f2fs/super.c > > between commit: > > 2c58d548f570 ("fscrypt: cache decrypted symlink target in ->i_link") > > from the fscrypt tree

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

Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/ext4/super.c fs/f2fs/super.c between commit: 2c58d548f570 ("fscrypt: cache decrypted symlink target in ->i_link") from the fscrypt tree and commits: 94053139d482 ("ext4: make use of ->free_inode()") d01718a050d0

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

Hi all, Today's linux-next merge of the vfs tree got a conflict in: include/linux/fs.h between commit: a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig") from the fscrypt tree and commit: 013c7af575e5 ("vfs: Implement a filesystem superblock creation/configuration context")

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

Hi all, Today's linux-next merge of the vfs tree got a conflict in: include/linux/fs.h between commit: a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig") from the fscrypt tree and commit: 37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration context")