Hi all,
Today's linux-next merge of the xfs tree got a conflict in
fs/xfs/xfs_aops.c between commit 2d2422aebc03 ("xfs: fix a use after free
in xfs_end_io_direct_write") from Linus' tree and commit a826361aa4af
("xfs: defer AIO/DIO completions") from the xfs tree.
The latter moves this code to another function (better solution?), so I
used the latter version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp_fSrdkYkIT.pgp
Description: PGP signature
