Messages in this thread | | | Date | Wed, 21 Jan 2015 18:14:50 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the block tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in mm/filemap.c and mm/truncate.c between commit de1414a654e6 ("fs: export inode_to_bdi and use it in favor of mapping->backing_dev_info") from the tree and commit d475bc581640 ("page_writeback: cleanup mess around cancel_dirty_page()") from the akpm-current tree.
I fixed it up (the latter removed the code modified by the former) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |