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 <asm-generic/io-64-nonatomic-lo-hi.h>
> > ^
> >
> > 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 <s...@canb.auug.org.au>
> > 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 <s...@canb.auug.org.au>
>
> 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 <linux/io-64-nonatomic-lo-hi.h>",
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
