Re: linux-next: manual merge of the xfs tree with the ext4 tree

From	Jan Kara <jack@suse.cz>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the xfs tree with the ext4 tree
Date	2016-03-10 10:20 +0100
Message-ID	<rb4Vc-4Jq-7@gated-at.bofh.it> (permalink)
References	<raW1B-716-41@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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@suse.com>
SUSE Labs, CR

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the xfs tree with the ext4 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-10 00:50 +0100
  Re: linux-next: manual merge of the xfs tree with the ext4 tree Jan Kara <jack@suse.cz> - 2016-03-10 10:20 +0100

csiph-web