From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbbJOJSA (ORCPT ); Thu, 15 Oct 2015 05:18:00 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:33889 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbbJOJR4 (ORCPT ); Thu, 15 Oct 2015 05:17:56 -0400 Date: Thu, 15 Oct 2015 10:17:52 +0100 From: Lee Jones To: Arnd Bergmann Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Christoph Hellwig Subject: Re: linux-next: build failure after merge of the mfd tree Message-ID: <20151015091752.GA31804@x1> References: <20151015132602.7816b658@canb.auug.org.au> <7853704.H00KElTCBt@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7853704.H00KElTCBt@wuerfel> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 15 Oct 2015, Arnd Bergmann wrote: > On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote: > > 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 > > The patch looks good, should we do something to prevent that from > becoming a problem when Linus pulls our branches? > > This commit is at the bottom of my asm-generic git tree, so Lee could merge > that one commit into his tree and fix up the merge correctly. > > However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > has the same problem, so maybe it's better to add a temporary file > with the old name containing "#include ", > which I will remove in the following merge window or as a follow-up. > > Yet another way would be for me to wait until Linus has pulled both > mfd and netdev been merged, and I'll let him know of the conflict > in my pull request. I'll remain flexible. Whatever you think is the best solution we'll go with and I'll facilitate. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog