Messages in this thread | | | Date | Tue, 3 Jan 2012 12:34:38 +1100 | From | Dave Chinner <> | Subject | Re: linux-next: manual merge of the xfs tree with Linus' tree |
| |
On Tue, Jan 03, 2012 at 12:06:32PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xfs tree got a conflict in > fs/xfs/xfs_sync.c between commit be4f1ac82877 ("xfs: log all dirty inodes > in xfs_fs_sync_fs") from the tree and commit 34625c661b01 ("xfs: remove > xfs_qm_sync") from the xfs tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks correct. Thanks Stephen.
Cheers,
Dave. -- Dave Chinner david@fromorbit.com
| |