From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751604AbcGWBEx (ORCPT ); Fri, 22 Jul 2016 21:04:53 -0400 Received: from mail-oi0-f49.google.com ([209.85.218.49]:33094 "EHLO mail-oi0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751008AbcGWBEv (ORCPT ); Fri, 22 Jul 2016 21:04:51 -0400 MIME-Version: 1.0 In-Reply-To: <20160722161320.144b7514@canb.auug.org.au> References: <20160722161320.144b7514@canb.auug.org.au> From: Dan Williams Date: Fri, 22 Jul 2016 18:04:49 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the nvdimm tree To: Stephen Rothwell Cc: Alasdair G Kergon , Mike Snitzer , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Toshi Kani Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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!