| To: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: linux-next: manual merge of the xfs tree with Linus' tree |
| From: | Christoph Hellwig <hch@xxxxxxxxxxxxx> |
| Date: | Thu, 15 Sep 2011 07:05:27 -0400 |
| Cc: | David Chinner <david@xxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx> |
| In-reply-to: | <20110915123031.104554f51c7642451fc31434@xxxxxxxxxxxxxxxx> |
| References: | <20110915123031.104554f51c7642451fc31434@xxxxxxxxxxxxxxxx> |
| User-agent: | Mutt/1.5.21 (2010-09-15) |
On Thu, Sep 15, 2011 at 12:30:31PM +1000, Stephen Rothwell wrote:
> 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.
Yes, the mainline version is a quick fix for the use after free, the
linux-next version fixes this by changing the broader scope.
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | linux-next: manual merge of the xfs tree with Linus' tree, Stephen Rothwell |
|---|---|
| Next by Date: | Вы выиграли 1,000,000.00 фунтов в британской телекоммуникационной промо. Отправить, "Alberto Erasmo Ramada Montaïez" |
| Previous by Thread: | linux-next: manual merge of the xfs tree with Linus' tree, Stephen Rothwell |
| Next by Thread: | Вы выиграли 1,000,000.00 фунтов в британской телекоммуникационной промо. Отправить, "Alberto Erasmo Ramada Montaïez" |
| Indexes: | [Date] [Thread] [Top] [All Lists] |