From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Subject: Re: linux-next: build failure after merge of the nvdimm tree Date: Fri, 22 Jul 2016 20:54:47 -0700 Message-ID: References: <20160722161320.144b7514@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-oi0-f52.google.com ([209.85.218.52]:33752 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751230AbcGWDyt (ORCPT ); Fri, 22 Jul 2016 23:54:49 -0400 Received: by mail-oi0-f52.google.com with SMTP id j185so188225155oih.0 for ; Fri, 22 Jul 2016 20:54:49 -0700 (PDT) In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Alasdair G Kergon , Mike Snitzer , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Toshi Kani On Fri, Jul 22, 2016 at 6:04 PM, Dan Williams wrote: > On Thu, Jul 21, 2016 at 11:13 PM, Stephen Rothwell 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.