On Fri, Jul 22, 2016 at 6:04 PM, Dan Williams <dan.j.williams@xxxxxxxxx> wrote:
> On Thu, Jul 21, 2016 at 11:13 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>> Hi Dan,
>>
>> After merging the nvdimm tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> In file included from drivers/md/dm.h:14:0,
>> from drivers/md/dm-uevent.c:27:
>> include/linux/device-mapper.h:134:22: error: expected ';', ',' or ')' before '*' token
>> void __pmem **kaddr, pfn_t *pfn, long size);
>> ^
>> include/linux/device-mapper.h:182:2: error: unknown type name 'dm_direct_access_fn'
>> dm_direct_access_fn direct_access;
>> ^
>>
>> Caused by commit
>>
>> 7a9eb2066631 ("pmem: kill __pmem address space")
>>
>> interacting with commit
>>
>> 545ed20e6df6 ("dm: add infrastructure for DAX support")
>>
>> from the device-mapper tree.
>>
>> I applied the following merge fix patch for today. Someone needs to
>> tell Linus about this when he merges the trees.
>
> There's no real rush to remove "__pmem" I'll pull this out until after
> DM DAX support has merged.
>
> Thanks Stephen!
Sorry, I forgot that some ARM patches already depend on this change...
so we'll need to roll forward and notify Linus about this merge
interaction.
--
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
