Re: linux-next: manual merge of the overlayfs tree with the btrfs-kdave tree

Hi all, On Tue, 29 May 2018 09:52:50 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the overlayfs tree got a conflict in: > > fs/btrfs/ioctl.c > > between commit: > > 0b4dc087e29a ("Btrfs: dedupe_file_range ioctl: remove 16MiB restriction") > > from the btrfs-kdave tree an

linux-next: manual merge of the overlayfs tree with the btrfs-kdave tree

Hi Miklos, Today's linux-next merge of the overlayfs tree got a conflict in: fs/btrfs/ioctl.c between commit: 0b4dc087e29a ("Btrfs: dedupe_file_range ioctl: remove 16MiB restriction") from the btrfs-kdave tree and commits: 83d499febfac ("vfs: dedpue: return loff_t") 7765f19ed5f9 ("vfs