Subject: linux-next: manual merge of the akpm tree with the block tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Jan 2015 18:46:06 +1100

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/filemap_xip.c between commit de1414a654e6 ("fs: export inode_to_bdi
and use it in favor of mapping->backing_dev_info") from the block tree
and commit cd5ca6e1eb43 ("dax,ext2: replace XIP read and write with DAX
I/O") from the akpm 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                    [email-masked]