* linux-next: manual merge of the writeback tree with the btrfs tree
@ 2013-02-22 2:36 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-02-22 2:36 UTC (permalink / raw)
To: Wu Fengguang; +Cc: linux-next, linux-kernel, Miao Xie, Chris Mason
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-22 2:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-22 2:36 linux-next: manual merge of the writeback tree with the btrfs tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).