On Thu 10-03-16 10:40:56, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/ext4/inode.c
>
> between commit:
>
> 109811c20fb8 ("ext4: simplify io_end handling for AIO DIO")
>
> from the ext4 tree and commit:
>
> 74c66bcb7eda ("ext4: Fix data exposure after failed AIO DIO")
>
> from the xfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks. The merge looks correct.
Honza
--
Jan Kara <j...@suse.com>
SUSE Labs, CR
