From: Jan Kara <jack@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jan Kara <jack@suse.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
xfs@oss.sgi.com
Subject: Re: linux-next: manual merge of the xfs tree with the ext4 tree
Date: Thu, 10 Mar 2016 10:18:40 +0100 [thread overview]
Message-ID: <20160310091840.GC5026@quack.suse.cz> (raw)
In-Reply-To: <20160310104056.78033e72@canb.auug.org.au>
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-03-10 9:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 23:40 linux-next: manual merge of the xfs tree with the ext4 tree Stephen Rothwell
2016-03-10 9:18 ` Jan Kara [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-09 23:41 Stephen Rothwell
2016-03-10 9:19 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160310091840.GC5026@quack.suse.cz \
--to=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox