Hi Stephen,
On Thu, Nov 16, 2017 at 02:16:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/block/brd.c
>
> between commit:
>
> 7a862fbbdec6 ("brd: remove dax support")
>
> from the nvdimm tree and commit:
>
> f8ace3501d00 ("bdi: introduce BDI_CAP_SYNCHRONOUS_IO")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
It's good for me.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
