Messages in this thread | | | Date | Thu, 10 Mar 2016 10:19:14 +0100 | From | Jan Kara <> | Subject | Re: linux-next: manual merge of the xfs tree with the ext4 tree |
| |
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
| |