On Thu 10-03-16 10:41:00, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/ext4/ext4.h
>
> 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! This merge looks correct as well.
Honza
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
