Messages in this thread | | | Date | Tue, 18 Aug 2009 17:17:02 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the xfs tree with Linus' tree |
| |
Hi Felix,
On Tue, 18 Aug 2009 01:49:52 -0500 Felix Blyakher <felixb@sgi.com> 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |