From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752124AbbJOI7x (ORCPT ); Thu, 15 Oct 2015 04:59:53 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:60171 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751374AbbJOI7t (ORCPT ); Thu, 15 Oct 2015 04:59:49 -0400 From: Arnd Bergmann To: Stephen Rothwell Cc: Lee Jones , 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 Date: Thu, 15 Oct 2015 10:59:32 +0200 Message-ID: <7853704.H00KElTCBt@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151015132602.7816b658@canb.auug.org.au> References: <20151015132602.7816b658@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:4F+rYL0pqi1djoQ4xQY5SkoiXdV9NZx3h/cn0sMUQ/p12tMZAin Cwpd3S6FuTnCcIJNca2HhfO6F6znCxZQNsyDKxFporcBrGi93pV+E8QriziFVbHaeseuSlT 8LdQZ8f0a2JPjzzCxpsGe5tIhPpxwI3jvQ6sVqOtCXalXn/6AE3J/a5UV1qpoAymXriAewn htS30zUQkqXq+enWcCzzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:I4cDN0DKn6U=:OofMAbV7IgJA8/c6owlAHj gw7OGnewOYGkClm8McTXAPeBLv+1koy7tQfQlt5o15O3gQn8T84SopuCqP4MixopxfiQfjici 9qzW1OJD5wgpBU2T9qMyQFje0EIDXmPSMhZCwXi/cWaoKpgBpX/xQD+BLkUg4GuPJkS2chbB1 H9qHf23oADy2Fz5yP43Bh7r63XC8Ktt0dFEsPqfOIfxAr+WoGLa1aWpiOxrthZ0Urndn9i4+L v15BujdG/CAHULlrXlLVCSMAZoP8Tb+9B/9Ahn9HOgjk//pBWH0BoJlIpQh6sApkgUeudMPqT aSdjBeQsj60vnh5n+PYQFXzVXIWtPYL6ZaFdXUciJXu7RK+2qQO24qDUzi6N6AAz0bbxztbY9 MYe8VMRWTreMZ0GGE+0fsX4CkfGvKW89vdeFzP8pL7jk4viA49a1gmFWlCkzjNE5l9JRihkvI k+lLm88zRjeMGUUlgV3jhcK6e/pbFhmsF7RTnZ8zTaljLp31o7y0G8uGEIDGwvHPRXeERupZc QmQzv/05q4MLzDC32BT5/sdsRbJo1xVU7BPKff0JoOPTfFJT39F/Zjf21YoHSQ3HRQmPgIB6+ 9yrXzGdcEiw+K5ZjYnojXb5kwESP9oarBHXh95wOGmvnr3SSIi94dKftJO0wNelRCDTcZywhc mxyqGhPzj+CxnCReAGAGdT6mzoJ2xLu0II7hPF4bNjSbiQ3A+TUzOSl1KacM5q5hDja4U4Wy0 pb4WtY1kbytvY1Hh Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Arnd