From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754301AbbJODf5 (ORCPT ); Wed, 14 Oct 2015 23:35:57 -0400 Received: from mga11.intel.com ([192.55.52.93]:9380 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753217AbbJODf4 (ORCPT ); Wed, 14 Oct 2015 23:35:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,684,1437462000"; d="scan'208";a="664649379" From: "Koul, Vinod" To: "sfr@canb.auug.org.au" , "arnd@arndb.de" CC: "hch@lst.de" , "linux-kernel@vger.kernel.org" , "andriy.shevchenko@linux.intel.com" , "linux-next@vger.kernel.org" Subject: Re: linux-next: build failure after merge of the slave-dma tree Thread-Topic: linux-next: build failure after merge of the slave-dma tree Thread-Index: AQHRBuOtpGlA7Vv+zUermouNIUA+G55riyaA Date: Thu, 15 Oct 2015 03:35:42 +0000 Message-ID: <1444880141.2926.28.camel@intel.com> References: <20151015115108.57c04f61@canb.auug.org.au> In-Reply-To: <20151015115108.57c04f61@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.223.188.113] Content-Type: text/plain; charset="utf-8" Content-ID: <1A6AF9697855DD40BE44244C88D422A9@intel.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id t9F3a2tx009214 On Thu, 2015-10-15 at 11:51 +1100, Stephen Rothwell wrote: > 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. Thanks Stephen, This looks fine to me. So should I ask Linus to apply this fix once merge window opens or you will send this, how do we go about fixing this one :) Or should I merge the above commit from asm-generic tree? -- ~Vinod {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I