From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753789AbbJOAvN (ORCPT ); Wed, 14 Oct 2015 20:51:13 -0400 Received: from ozlabs.org ([103.22.144.67]:54744 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751222AbbJOAvM (ORCPT ); Wed, 14 Oct 2015 20:51:12 -0400 Date: Thu, 15 Oct 2015 11:51:08 +1100 From: Stephen Rothwell To: Vinod Koul , Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Andy Shevchenko Subject: linux-next: build failure after merge of the slave-dma tree Message-ID: <20151015115108.57c04f61@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 Vinod, After merging the slave-dma tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/dma/idma64.h:19:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory #include ^ Caused by commit 97c37accd38f ("dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()") interacting with commit f626fe17485b ("move io-64-nonatomic*.h out of asm-generic") from the asm-generic tree. I have applied the folling merge fix patch and can carry it as necessary. From: Stephen Rothwell Date: Thu, 15 Oct 2015 11:47:07 +1100 Subject: [PATCH] dmaengine: idma64: merge fix for "move io-64-nonatomic*.h out of asm-generic" Signed-off-by: Stephen Rothwell --- drivers/dma/idma64.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h index f6aeff0af8a5..801d5462d663 100644 --- a/drivers/dma/idma64.h +++ b/drivers/dma/idma64.h @@ -15,8 +15,7 @@ #include #include #include - -#include +#include #include "virt-dma.h" -- 2.5.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au