* linux-next: build failure after merge of the asm-generic tree
@ 2015-10-14 22:55 Stephen Rothwell
2015-10-14 23:32 ` kbuild test robot
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-10-14 22:55 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Christoph Hellwig
Hi Arnd,
After merging the asm-generic tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/acpi/osl.c:46: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
f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")
interacting with commit
3277b4ea216e ("ACPI / osl: replace custom implementation of readq / writeq")
from Linus' tree (added before v4.3-rc1).
I added the following build fix:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 15 Oct 2015 09:50:08 +1100
Subject: [PATCH] fix for "move io-64-nonatomic*.h out of asm-generic"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/acpi/osl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 739a4a6b3b9b..ed219da94904 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -40,10 +40,10 @@
#include <linux/list.h>
#include <linux/jiffies.h>
#include <linux/semaphore.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
#include "internal.h"
--
2.5.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the asm-generic tree
2015-10-14 22:55 linux-next: build failure after merge of the asm-generic tree Stephen Rothwell
@ 2015-10-14 23:32 ` kbuild test robot
2015-10-15 2:37 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: kbuild test robot @ 2015-10-14 23:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: kbuild-all, Arnd Bergmann, linux-next, linux-kernel,
Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]
Hi Stephen,
[auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]
url: https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-build-failure-after-merge-of-the-asm-generic-tree/20151015-065548
config: i386-randconfig-i1-201541 (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
>> drivers/acpi/osl.c:43:41: fatal error: linux/io-64-nonatomic-lo-hi.h: No such file or directory
compilation terminated.
vim +43 drivers/acpi/osl.c
37 #include <linux/acpi.h>
38 #include <linux/efi.h>
39 #include <linux/ioport.h>
40 #include <linux/list.h>
41 #include <linux/jiffies.h>
42 #include <linux/semaphore.h>
> 43 #include <linux/io-64-nonatomic-lo-hi.h>
44
45 #include <asm/io.h>
46 #include <asm/uaccess.h>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 18058 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the asm-generic tree
2015-10-14 23:32 ` kbuild test robot
@ 2015-10-15 2:37 ` Stephen Rothwell
2015-10-15 14:45 ` [kbuild-all] " Fengguang Wu
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-10-15 2:37 UTC (permalink / raw)
To: kbuild test robot
Cc: kbuild-all, Arnd Bergmann, linux-next, linux-kernel,
Christoph Hellwig
Hi,
On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel•com> wrote:
>
> [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]
I think you should just ignore any patches from me that have
"linux-next:" in the subject line as they need to be applied either to
a branch I have merged or to a combination of branches I have merged.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [kbuild-all] linux-next: build failure after merge of the asm-generic tree
2015-10-15 2:37 ` Stephen Rothwell
@ 2015-10-15 14:45 ` Fengguang Wu
2015-10-15 14:56 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Fengguang Wu @ 2015-10-15 14:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Christoph Hellwig, kbuild-all, Arnd Bergmann,
linux-kernel
Hi Stephen,
On Thu, Oct 15, 2015 at 01:37:34PM +1100, Stephen Rothwell wrote:
> Hi,
>
> On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel•com> wrote:
> >
> > [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]
>
> I think you should just ignore any patches from me that have
> "linux-next:" in the subject line as they need to be applied either to
> a branch I have merged or to a combination of branches I have merged.
OK. Sorry for the noise!
Thanks,
Fengguang
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [kbuild-all] linux-next: build failure after merge of the asm-generic tree
2015-10-15 14:45 ` [kbuild-all] " Fengguang Wu
@ 2015-10-15 14:56 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-10-15 14:56 UTC (permalink / raw)
To: Fengguang Wu
Cc: linux-next, Christoph Hellwig, kbuild-all, Arnd Bergmann,
linux-kernel
Hi Fengguang,
On Thu, 15 Oct 2015 22:45:32 +0800 Fengguang Wu <lkp@intel•com> wrote:
>
> On Thu, Oct 15, 2015 at 01:37:34PM +1100, Stephen Rothwell wrote:
> >
> > On Thu, 15 Oct 2015 07:32:27 +0800 kbuild test robot <lkp@intel•com> wrote:
> > >
> > > [auto build test ERROR on v4.3-rc5 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]
> >
> > I think you should just ignore any patches from me that have
> > "linux-next:" in the subject line as they need to be applied either to
> > a branch I have merged or to a combination of branches I have merged.
>
> OK. Sorry for the noise!
No worries, keep up the good work!
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-15 14:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-14 22:55 linux-next: build failure after merge of the asm-generic tree Stephen Rothwell
2015-10-14 23:32 ` kbuild test robot
2015-10-15 2:37 ` Stephen Rothwell
2015-10-15 14:45 ` [kbuild-all] " Fengguang Wu
2015-10-15 14:56 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox