| To: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: linux-next: manual merge of the xfs tree with Linus' tree |
| From: | Dave Chinner <david@xxxxxxxxxxxxx> |
| Date: | Tue, 3 Jan 2012 12:34:38 +1100 |
| Cc: | xfs-masters@xxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx>, Ben Myers <bpm@xxxxxxx> |
| In-reply-to: | <20120103120632.a43a2ab50ac747093bbb2f5f@xxxxxxxxxxxxxxxx> |
| References: | <20120103120632.a43a2ab50ac747093bbb2f5f@xxxxxxxxxxxxxxxx> |
| User-agent: | Mutt/1.5.21 (2010-09-15) |
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@xxxxxxxxxxxxx
|
| <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: | I: Fattoria l'Amorosa, Fattoria l'Amorosa |
| Previous by Thread: | linux-next: manual merge of the xfs tree with Linus' tree, Stephen Rothwell |
| Next by Thread: | I: Fattoria l'Amorosa, Fattoria l'Amorosa |
| Indexes: | [Date] [Thread] [Top] [All Lists] |