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 ("Btrfs: fallocate: Work with sectorsized blocks")
>
> from the btrfs-kdave tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fixes look good to me. Thanks for doing this.
--
chandan
