| To: | David Chinner <david@xxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx |
|---|---|
| Subject: | linux-next: manual merge of the xfs tree with Linus' tree |
| From: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
| Date: | Thu, 15 Sep 2011 12:30:31 +1000 |
| Cc: | linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx> |
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/
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: xfs deadlock in stable kernel 3.0.4, Stefan Priebe - Profihost AG |
|---|---|
| Next by Date: | Re: linux-next: manual merge of the xfs tree with Linus' tree, Christoph Hellwig |
| Previous by Thread: | targeted email lists in many different areas, dally Collins |
| Next by Thread: | Re: linux-next: manual merge of the xfs tree with Linus' tree, Christoph Hellwig |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
