linux-next: manual merge of the writeback tree with the btrfs tree

From: Stephen Rothwell
Date: Thu Feb 21 2013 - 21:36:51 EST

Hi Wu,

Today's linux-next merge of the writeback tree got a conflict in
fs/btrfs/extent-tree.c between commit da633a421701 ("Btrfs: flush all
dirty inodes if writeback can not start") from the btrfs tree and commit
10ee27a06cc8 ("vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and
rename them") from the writeback tree.

I fixed it up (I assumed that the former supercedes the latter and used
that) and can carry the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature