linux-next: build failures after merge of the hid tree

linux-next: build failures after merge of the hid tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi all,

After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/hid/intel-ish-hid/ipc/ipc.c:12:10: fatal error: client.h: No such file or directory
   12 | #include "client.h"
      |          ^~~~~~~~~~
drivers/hid/intel-ish-hid/ipc/pci-ish.c:22:10: fatal error: ishtp-dev.h: No such file or directory
   22 | #include "ishtp-dev.h"
      |          ^~~~~~~~~~~~~

I don't know what caused it, but commit

  470376737e88 ("HID: allow building hid.ko as an external module")

did not fix it.  BTW, I build with "make O=...".

I have used the hid tree from next-20200618 for today.

BTW, the hid tree really needs cleaning up, it contains merge commits dating
back to April 2018 :-(

$ git rev-list --count origin/master..hid/for-next
301
$ git rev-list --no-merges --count origin/master..hid/for-next
12

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failures after merge of the hid tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

Hi all,

On Sun, 21 Jun 2020 14:04:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/hid/intel-ish-hid/ipc/ipc.c:12:10: fatal error: client.h: No such file or directory
>    12 | #include "client.h"
>       |          ^~~~~~~~~~
> drivers/hid/intel-ish-hid/ipc/pci-ish.c:22:10: fatal error: ishtp-dev.h: No such file or directory
>    22 | #include "ishtp-dev.h"
>       |          ^~~~~~~~~~~~~
> 
> I don't know what caused it, but commit
> 
>   470376737e88 ("HID: allow building hid.ko as an external module")
> 
> did not fix it.  BTW, I build with "make O=...".
> 
> I have used the hid tree from next-20200618 for today.
> 
> BTW, the hid tree really needs cleaning up, it contains merge commits dating
> back to April 2018 :-(
> 
> $ git rev-list --count origin/master..hid/for-next
> 301
> $ git rev-list --no-merges --count origin/master..hid/for-next
> 12

I am still getting this failure.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failures after merge of the hid tree

[Benjamin Tissoires]

[adding Cristian, the author of the patch]


On Tue, Jun 23, 2020 at 2:37 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Sun, 21 Jun 2020 14:04:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > drivers/hid/intel-ish-hid/ipc/ipc.c:12:10: fatal error: client.h: No such file or directory
> >    12 | #include "client.h"
> >       |          ^~~~~~~~~~
> > drivers/hid/intel-ish-hid/ipc/pci-ish.c:22:10: fatal error: ishtp-dev.h: No such file or directory
> >    22 | #include "ishtp-dev.h"
> >       |          ^~~~~~~~~~~~~
> >
> > I don't know what caused it, but commit
> >
> >   470376737e88 ("HID: allow building hid.ko as an external module")

I am under the impression that this patch is causing the issue.

I am tempted to revert it (and force push the branch hid/for-5.9/core)
given that the 0-day bot also complained.

> >
> > did not fix it.  BTW, I build with "make O=...".
> >
> > I have used the hid tree from next-20200618 for today.
> >
> > BTW, the hid tree really needs cleaning up, it contains merge commits dating
> > back to April 2018 :-(

We are carefully not force pushing the hid/for-next branch, and all
the merges you are seeing there are the various merges we do after
including a patch that will be sent to linus later. Our for-next
branch never gets merged into for-linus, we handle that separately.

I always thought you prefer not having forced push on the for-next
branch. But if you rather us overwriting the tip of the branch at
every commit, we can do it for sure.

For reference, the way we handle branches are:
- master branch follows Linus' when there is an upstream merge of the
hid/for-linus branch
- every single commit goes into a branch named
for-<kernel_version>/<feature_name>
- those branches are created on top of current master and are never rebased
- every time we add a patch (series) on top of a feature branch, we
merge that into hid/for-next
- when we need to send a pull request to Linus, we merge the matching
"for-<kernel_version>/*" branches into hid/for-linus

This allows to keep a clear view of what is scheduled to be sent. But
the counterpart is that the hid/for-next branch never gets merged back
into hid/for-linus.

Cheers,
Benjamin

> >
> > $ git rev-list --count origin/master..hid/for-next
> > 301
> > $ git rev-list --no-merges --count origin/master..hid/for-next
> > 12
>
> I am still getting this failure.
>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failures after merge of the hid tree

[Jiri Kosina]

On Tue, 23 Jun 2020, Stephen Rothwell wrote:

> > I don't know what caused it, but commit
> > 
> >   470376737e88 ("HID: allow building hid.ko as an external module")
> > 
> > did not fix it.  BTW, I build with "make O=...".

That's actually the patch that almost certainly broke it.

CCing Cristian (author of that patch) and Nathan, who apparently sent a 
fixup patch for this, but I haven't seen it, as our corporate mailserver 
had severe issues yesterday.

If there is no resolution by tomorrow, we'll just drop it.

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: build failures after merge of the hid tree

[Nathan Chancellor]

Hi Jiri and Cristian,

On Wed, Jun 24, 2020 at 12:13:57AM +0200, Jiri Kosina wrote:
> On Tue, 23 Jun 2020, Stephen Rothwell wrote:
> 
> > > I don't know what caused it, but commit
> > > 
> > >   470376737e88 ("HID: allow building hid.ko as an external module")
> > > 
> > > did not fix it.  BTW, I build with "make O=...".
> 
> That's actually the patch that almost certainly broke it.
> 
> CCing Cristian (author of that patch) and Nathan, who apparently sent a 
> fixup patch for this, but I haven't seen it, as our corporate mailserver 
> had severe issues yesterday.
> 
> If there is no resolution by tomorrow, we'll just drop it.
> 
> -- 
> Jiri Kosina
> SUSE Labs
> 

Sorry, I was not clear in my message about what I was "fixing", which
was the fact that Cristian's initial reply was top posted, which I moved
to the bottom. I thought that would have been apparent in a mail client,
my bad :( I have not sent a fix for this issue.

Cheers,
Nathan

Re: linux-next: build failures after merge of the hid tree

[Jiri Kosina]

On Wed, 24 Jun 2020, Jiri Kosina wrote:

> > > I don't know what caused it, but commit
> > > 
> > >   470376737e88 ("HID: allow building hid.ko as an external module")
> > > 
> > > did not fix it.  BTW, I build with "make O=...".
> 
> That's actually the patch that almost certainly broke it.
> 
> CCing Cristian (author of that patch) and Nathan, who apparently sent a 
> fixup patch for this, but I haven't seen it, as our corporate mailserver 
> had severe issues yesterday.

I've now dropped the patch from hid.git

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: build failures after merge of the hid tree

[Cristian Klein]

[-- Attachment #1: Type: text/plain, Size: 840 bytes --]

On Wed, Jun 24, 2020 at 09:30:23AM +0200, Jiri Kosina wrote:
> On Wed, 24 Jun 2020, Jiri Kosina wrote:
> 
> > > > I don't know what caused it, but commit
> > > > 
> > > >   470376737e88 ("HID: allow building hid.ko as an external module")
> > > > 
> > > > did not fix it.  BTW, I build with "make O=...".
> > 
> > That's actually the patch that almost certainly broke it.
> > 
> > CCing Cristian (author of that patch) and Nathan, who apparently sent a 
> > fixup patch for this, but I haven't seen it, as our corporate mailserver 
> > had severe issues yesterday.
> 
> I've now dropped the patch from hid.git
> 
> -- 
> Jiri Kosina
> SUSE Labs
> 

Hi,

I tried several times, but I cannot reproduce. Attached the full compile
log.

Any pointers of why compilation fails on 0day-ci?

--
Cristian Klein, PhD
Cloud-Native Expert
Elastisys AB

[-- Attachment #2: compile.log --]
[-- Type: text/plain, Size: 4718 bytes --]

cklein@minitrue:~/linux$ git log -3 | cat
commit 35f098c7cdba4e9ec2fcdf5e75411fb96bb8c289
Author: Cristian Klein <cristian.klein@elastisys.com>
Date:   Mon Jun 22 09:59:02 2020 +0200

    linux-next: Signed-off-by missing for commit in the hid tree
    
    On Sun, Jun 21, 2020 at 07:51:24AM +1000, Stephen Rothwell wrote:
    > Hi all,
    >
    > Commit
    >
    >   470376737e88 ("HID: allow building hid.ko as an external module")
    >
    > is missing a Signed-off-by from its author.
    >
    > --
    > Cheers,
    > Stephen Rothwell
    
    Hi,
    
    My bad. Please find attached the corrected patch.
    
    Cheers,
    Cristian
    
    From 8005724373d8cecb241c013d16b2242c7c1fb39e Mon Sep 17 00:00:00 2001
    From: Cristian Klein <cristian.klein@elastisys.com>
    Date: Mon, 22 Jun 2020 08:47:58 +0200
    Subject: [PATCH] Allow building hid.ko as an "external" module
    
    For quickly testing USB HID quirks with a larger community, it is useful
    to be able to build hid.ko as an external module, e.g., against the
    source code of the running kernel.
    
    Before this patch this failed as follows:
    ```
    $ make -C /lib/modules/$(uname -r)/build M=$PWD/drivers/hid
    make: Entering directory '/usr/src/linux-headers-5.3.0-51-generic'
      CC [M]  /home/cklein/linux/drivers/hid/i2c-hid/i2c-hid-core.o
      CC [M]  /home/cklein/linux/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.o
      LD [M]  /home/cklein/linux/drivers/hid/i2c-hid/i2c-hid.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/init.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/hbm.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/client.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/bus.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/dma-if.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ishtp/client-buffers.o
      LD [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/intel-ishtp.o
      CC [M]  /home/cklein/linux/drivers/hid/intel-ish-hid/ipc/ipc.o
    /home/cklein/linux/drivers/hid/intel-ish-hid/ipc/ipc.c:12:10: fatal error: client.h: No such file or directory
       12 | #include "client.h"
          |          ^~~~~~~~~~
    compilation terminated.
    make[2]: *** [scripts/Makefile.build:290: /home/cklein/linux/drivers/hid/intel-ish-hid/ipc/ipc.o] Error 1
    make[1]: *** [scripts/Makefile.build:519: /home/cklein/linux/drivers/hid/intel-ish-hid] Error 2
    make: *** [Makefile:1656: _module_/home/cklein/linux/drivers/hid] Error 2
    make: Leaving directory '/usr/src/linux-headers-5.3.0-51-generic'
    ```
    
    Signed-off-by: Cristian Klein <cristian.klein@elastisys.com>

commit c1a371cf80fbc06280cc0064ca99a39d0428ded3
Author: Randy Dunlap <rdunlap@infradead.org>
Date:   Mon Apr 13 09:14:35 2020 -0700

    printk: fix global comment
    
    Fix typo/spello.
    
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 20607434113b8f7d74cfc98e27a4199535c1d4fa
Author: Randy Dunlap <rdunlap@infradead.org>
Date:   Mon Mar 30 17:22:11 2020 -0700

    lib/bitmap.c: fix spello
    
    Fix typo/spello for whitespaces.
    
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
cklein@minitrue:~/linux$ cat drivers/hid/intel-ish-hid/Makefile 
# SPDX-License-Identifier: GPL-2.0
#
# Makefile - Intel ISH HID drivers
# Copyright (c) 2014-2016, Intel Corporation.
#
#
obj-$(CONFIG_INTEL_ISH_HID) += intel-ishtp.o
intel-ishtp-objs := ishtp/init.o
intel-ishtp-objs += ishtp/hbm.o
intel-ishtp-objs += ishtp/client.o
intel-ishtp-objs += ishtp/bus.o
intel-ishtp-objs += ishtp/dma-if.o
intel-ishtp-objs += ishtp/client-buffers.o

obj-$(CONFIG_INTEL_ISH_HID) += intel-ish-ipc.o
intel-ish-ipc-objs := ipc/ipc.o
intel-ish-ipc-objs += ipc/pci-ish.o

obj-$(CONFIG_INTEL_ISH_HID) += intel-ishtp-hid.o
intel-ishtp-hid-objs := ishtp-hid.o
intel-ishtp-hid-objs += ishtp-hid-client.o

obj-$(CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ishtp-loader.o
intel-ishtp-loader-objs += ishtp-fw-loader.o

ccflags-y += -I $(src)/ishtp
cklein@minitrue:~/linux$ make W=1 ARCH=x86_64 -j4
  DESCEND  objtool
  CALL    scripts/atomic/check-atomics.sh
  CALL    scripts/checksyscalls.sh
  CHK     include/generated/compile.h
  TEST    posttest
  MODPOST 2315 modules
arch/x86/tools/insn_decoder_test: success: Decoded and checked 6276029 instructions
  TEST    posttest
arch/x86/tools/insn_sanity: Success: decoded and checked 1000000 random instructions with 0 errors (seed:0xbc0b57f0)
Kernel: arch/x86/boot/bzImage is ready  (#1)