From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753943AbbJOC0H (ORCPT ); Wed, 14 Oct 2015 22:26:07 -0400 Received: from ozlabs.org ([103.22.144.67]:51944 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751098AbbJOC0E (ORCPT ); Wed, 14 Oct 2015 22:26:04 -0400 Date: Thu, 15 Oct 2015 13:26:02 +1100 From: Stephen Rothwell To: Lee Jones , Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Christoph Hellwig Subject: linux-next: build failure after merge of the mfd tree Message-ID: <20151015132602.7816b658@canb.auug.org.au> X-Mailer: Claws Mail 3.12.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 Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/intel-lpss.c:29:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory #include ^ Caused by commit 6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper") interacting with commit f626fe17485b ("move io-64-nonatomic*.h out of asm-generic") from the asm-generic tree. I have added the following merge fix patch and can carry it as necessary. From: Stephen Rothwell Date: Thu, 15 Oct 2015 13:23:20 +1100 Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic" Signed-off-by: Stephen Rothwell --- drivers/mfd/intel-lpss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 001a7d7708ce..6255513f54c7 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -25,8 +25,7 @@ #include #include #include - -#include +#include #include "intel-lpss.h" -- 2.5.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au