| To: | Felix Blyakher <felixb@xxxxxxx> |
|---|---|
| Subject: | Re: linux-next: manual merge of the xfs tree with Linus' tree |
| From: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
| Date: | Tue, 18 Aug 2009 17:17:02 +1000 |
| Cc: | David Chinner <david@xxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Eric Sandeen <sandeen@xxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx> |
| In-reply-to: | <523385BE-5397-49A3-A158-FD1B9D12F067@xxxxxxx> |
| References: | <20090818101215.aba4d0bf.sfr@xxxxxxxxxxxxxxxx> <523385BE-5397-49A3-A158-FD1B9D12F067@xxxxxxx> |
Hi Felix, On Tue, 18 Aug 2009 01:49:52 -0500 Felix Blyakher <felixb@xxxxxxx> wrote: > > Thanks for the fix, but there is no need to carrying it separately > from the xfs master tree. I merged the bc990f5 commit back into the > the master tree, and fixed all conflicts (there was another one in > fs/xfs/xfs_iget.c). I planned to do it anyway for 2.6.32. Thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
|
| <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: | Re: linux-next: manual merge of the xfs tree with Linus' tree, Felix Blyakher |
| Previous by Thread: | Re: linux-next: manual merge of the xfs tree with Linus' tree, Felix Blyakher |
| Next by Thread: | Admin Help Desk, ADMIN |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
