[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAPcyv4j4K-nQL-BtyugNWRPZ1QbnkD=Jj=tMaYdrjKuDOm2Wpw@mail.gmail.com>
Date: Fri, 22 Jul 2016 20:54:47 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Alasdair G Kergon <agk@...hat.com>,
Mike Snitzer <snitzer@...hat.com>, linux-next@...r.kernel.org,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Toshi Kani <toshi.kani@....com>
Subject: Re: linux-next: build failure after merge of the nvdimm tree
On Fri, Jul 22, 2016 at 6:04 PM, Dan Williams <dan.j.williams@...el.com> wrote:
> On Thu, Jul 21, 2016 at 11:13 PM, Stephen Rothwell <sfr@...b.auug.org.au> 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.
Powered by blists - more mailing lists