From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933344AbbLOJzr (ORCPT ); Tue, 15 Dec 2015 04:55:47 -0500 Received: from ozlabs.org ([103.22.144.67]:56288 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933146AbbLOJzo (ORCPT ); Tue, 15 Dec 2015 04:55:44 -0500 Date: Tue, 15 Dec 2015 20:55:42 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Minchan Kim Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20151215205542.66475b63@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, After merging the akpm-current tree, today's linux-next build (powerpc pseries_le_defconfig) failed like this: mm/huge_memory.c: In function 'madvise_free_huge_pmd': mm/huge_memory.c:1592:14: error: implicit declaration of function 'pmd_mkclean' [-Werror=implicit-function-declaration] orig_pmd = pmd_mkclean(orig_pmd); ^ Caused by me screwing up the merge resolution :-( So I readded the definition of pmd_mkclean to arch/powerpc/include/asm/book3s/64/pgtable.h BTW, patch "arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP" adds a second identical definition of pmd_dirty() ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au