linux-next: manual merge of the akpm-current tree with the dax-misc tree

2016-05-19 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/dax.h between commit: bc2466e42573 ("dax: Use radix tree entry lock to protect cow faults") from the dax-misc tree and commit: c2ce6adc69c8 ("dax: add dax_get_unmapped_area for pmd mappings")

linux-next: manual merge of the akpm-current tree with the dax-misc tree

2016-05-19 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/dax.h between commit: bc2466e42573 ("dax: Use radix tree entry lock to protect cow faults") from the dax-misc tree and commit: c2ce6adc69c8 ("dax: add dax_get_unmapped_area for pmd mappings")

linux-next: manual merge of the akpm-current tree with the dax-misc tree

2016-05-17 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/dax.h between commit: ecdb4bf9e327 ("dax: export a low-level __dax_zero_page_range helper") from the dax-misc tree and commit: 29d44f6759f6 ("dax: add dax_get_unmapped_area for pmd mappings")

linux-next: manual merge of the akpm-current tree with the dax-misc tree

2016-05-17 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/dax.h between commit: ecdb4bf9e327 ("dax: export a low-level __dax_zero_page_range helper") from the dax-misc tree and commit: 29d44f6759f6 ("dax: add dax_get_unmapped_area for pmd mappings")