From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754213AbbJPKK6 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 16 Oct 2015 06:10:58 -0400
Received: from mout.kundenserver.de ([212.227.126.131]:56489 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753264AbbJPKK4 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 16 Oct 2015 06:10:56 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>, Lee Jones <lee.jones@linaro.org>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: linux-next: build failure after merge of the mfd tree
Date: Fri, 16 Oct 2015 12:10:45 +0200
Message-ID: <4536236.o1KfIdZ0yO@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20151016122704.4320da9e@canb.auug.org.au>
References: <20151015132602.7816b658@canb.auug.org.au> <5895082.5iDhc8pylg@wuerfel> <20151016122704.4320da9e@canb.auug.org.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:nY9peHvwB7lXxCP7S/tkOwrMpbAhfcwDfhvYkUSU7iVzOoVA67S
 pl2InrlnS/eQ0leBJz8UPllN3sFtd5KpPhYW9h0uqsCNahIni1a25EOA1W7qr6a2b2trsUD
 rz/LysU9wrs5LX+W4Vp2D+58pMOrplici5WfbXdX5tBoawGaRBYJHe8VfZxA1aULeG2PCEc
 rD+nHTkwNAzVc6h8p9akw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:Adpv4PWfFqc=:04cuXihKA1WBfAiFkRNobI
 8u9aluJ5MtS90yCkmiQPjsTYNw/SbeZ5tgBVEVUEmzMtYha3yeYR1RW0oDW5MiiqsM46eSy85
 Xv2JUf4EGVAZI1yJB5f0zpAeKSB3EseST7zD4rGKectPPiwmblHKlOMOClvpexDrRY7fHPu7P
 ZknyaH6Pydd4WZPsl3mMTIFj6ylbVXHKxqtyOiluUE+hhIohc/KK5QUNjYoJMVCB3MQz4bAPE
 C7cg2sRpRF9WoqXNoO5CYL5ewzVu2r3zmhB2wAMkCSt5VAUSM0PmGf1KPgfPdE7QRQa5zdluj
 Bt2BeHHwbxELwoCQOMe4FtXnA8nYdniyExcZcqdBc1jsxHJp3VGtj1l2XBnFA/qjDfAOo5DTv
 sACccToTE0/Q3mydlg+80cSJOpUqqOhcbtdhnCfm6rBx0Xerjl5BKvoFqO1LFywhr1yztMkUL
 SkkLJKl5VwsoAqULqc2cALA6k3D+/eOQ799IAjDbdX9vVjA4WGUIovC0/PhrDP2dmoYYa15VH
 yciLlvC13LpWTvrpurRhGR0Gg9d9q4056QR5sNFStgUTNK9FGWK5G1QGvlq5A4MXlg7tEZuMz
 VylCsrz8ZD00r8XfHvcIP5u0VWocqy76T/Ge1ByPu+SnpB43N2zUZGjU59V23uCz2DjMNLKFh
 v46W9ePgJ37n/CLHyvQqk3bHA4FsP1SVRwIXd2NKCiPc2AY5390BYU4ahgHe0JDPK5UewoZax
 YQQhXdsu42Q5gclC
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Friday 16 October 2015 12:27:04 Stephen Rothwell wrote:
> Hi Arnd,
> 
> On Thu, 15 Oct 2015 14:28:20 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
> > new file mode 100644
> > index 000000000000..32b73abce1b0
> > --- /dev/null
> > +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
> > @@ -0,0 +1,2 @@
> > +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
> > +#include <linux/io-64-nonatomic-hi-lo.h>
> 
> Turns out you need the same for io-64-nonatomic-lo-hi.h as well ...
> 
> 


D'oh!

fixed now, thanks for your patience.

	Arnd