lkml.org 
[lkml]   [2016]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the xfs tree with the ext4 tree
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 <jack@suse.com>
SUSE Labs, CR

\
 
 \ /
  Last update: 2016-03-10 11:01    [W:2.758 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site