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

2019-09-23 Thread David Sterba
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

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

2017-09-03 Thread Stephen Rothwell
Hi all, On Fri, 25 Aug 2017 09:58:25 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the btrfs-kdave tree got a conflict in: > > fs/btrfs/inode.c > > between commit: > > 58efbc9f5463 ("Btrfs: fix blk_status_t/errno confusion") > > from Linus' tree and commit: > > e6961ca

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

2017-07-21 Thread David Sterba
On Tue, Jul 18, 2017 at 10:18:02AM +1000, Stephen Rothwell wrote: > Hi David, > > Today's linux-next merge of the btrfs-kdave tree got a conflict in: > > fs/btrfs/extent_io.c > > between commit: > > e6959b9350c6 ("btrfs: add support for passing in write hints for buffered > writes") > > f

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

2016-02-01 Thread Chandan Rajendra
On Tuesday 02 Feb 2016 10:22:16 Stephen Rothwell wrote: > Hi David, > > Today's linux-next merge of the btrfs-kdave tree got a conflict in: > > fs/btrfs/file.c > > between commit: > > 5955102c9984 ("wrappers for ->i_mutex access") > > from Linus' tree and commit: > > 9703fefe0b13 ("Btrf