Messages in this thread | | | Date | Tue, 19 Jul 2011 11:29:23 +1000 | From | Dave Chinner <> | Subject | Re: linux-next: manual merge of the vfs tree with the xfs tree |
| |
On Mon, Jul 18, 2011 at 01:36:36PM +1000, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the vfs tree got a conflict in > fs/xfs/linux-2.6/xfs_super.c between commit 2bcf6e970f5a ("xfs: start > periodic workers later") from the xfs tree and commit d86b98f73104 ("xfs: > make use of new shrinker callout for the inode cache") from the vfs tree. > > I fixed it up (I think, see below) and can carry the fix as necessary.
Looks OK to me.
Cheers,
Dave. -- Dave Chinner david@fromorbit.com
| |