On Thu, Sep 19, 2019 at 12:31:06PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the btrfs-kdave tree got conflicts in: > > fs/btrfs/block-group.c > fs/btrfs/ctree.h > fs/btrfs/extent-tree.c > fs/btrfs/send.c > fs/btrfs/space-info.c > include/uapi/linux/btrfs_tree.h > > between a number of commits in Linus' tree and a number of commits in > the btrfs-kdave tree. I don't feel comfortable that I can resolve these > safely and the btrfs-kdave tree hasn't changed since August with the > last non-merge commit in June so I've dropped the tree for today. Dropping the tree temporarily is ok. I'm going to refresh the source branch today so it should be in a good shape for next linux-next snapshot.
