On Fri, May 01, 2020 at 10:28:25AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the btrfs tree got a conflict in: > > fs/btrfs/tree-log.c > > between commit: > > f135cea30de5 ("btrfs: fix partial loss of prealloc extent past i_size after fsync") > > from the btrfs-fixes tree and commit: > > e94d318f12cd ("btrfs: fix partial loss of prealloc extent past i_size after fsync") Conflicts in the above commit and "btrfs: force chunk allocation if our global rsv is larger than metadata" should be gone now. Both patches have been merged to master and fresh for-next branch pushed to k.org.