linux-next: build failure after merge of the char-misc tree

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/char/bsr.c: In function 'bsr_init':
drivers/char/bsr.c:301:13: error: 'err' undeclared (first use in this function)
  301 |         if (err)
      |             ^~~
drivers/char/bsr.c:301:13: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  e55ce9fd3d8f ("bsr: make bsr_class a static const structure")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Mon, Jun 26, 2023 at 02:25:37PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/char/bsr.c: In function 'bsr_init':
> drivers/char/bsr.c:301:13: error: 'err' undeclared (first use in this function)
>   301 |         if (err)
>       |             ^~~
> drivers/char/bsr.c:301:13: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   e55ce9fd3d8f ("bsr: make bsr_class a static const structure")
> 
> I have reverted that commit for today.

Ick, I wonder what is up with the 0-day bot these days, I'm not getting
any reports and it should have caught this...

Anyway, I've applied the patch below to fix this up, thanks for the
report!

greg k-h

--------------

From adfdaf81f9d48d8618a4d8296567248170fe7bcc Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Jun 2023 11:03:21 +0200
Subject: [PATCH] bsr: fix build problem with bsr_class static cleanup

In commit e55ce9fd3d8f ("bsr: make bsr_class a static const structure"),
the bsr_init function was converted to handle a static class structure,
but the conversion got a variable name wrong, which caused build errors
so fix that up.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ivan Orlov <ivan.orlov0322@gmail.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20230626142537.755ec782@canb.auug.org.au
Fixes: e55ce9fd3d8f ("bsr: make bsr_class a static const structure")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/char/bsr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 0654f0e6b320..12143854aeac 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -298,7 +298,7 @@ static int __init bsr_init(void)
 		goto out_err;
 
 	ret = class_register(&bsr_class);
-	if (err)
+	if (ret)
 		goto out_err_1;
 
 	ret = alloc_chrdev_region(&bsr_dev, 0, BSR_MAX_DEVS, "bsr");
-- 
2.41.0

Re: 回复: 回复: 回复: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Thu, Jul 03, 2025 at 11:09:10AM +0000, Xu, Lizhi wrote:
> Please read the context carefully, and you will understand that this is
> where everything starts.

I'm sorry, but I do not understand your quoting style.  Didn't the links
I provided earlier explain this?

> In the code before memset, the ev variable only
> initializes the members of its member hdr.

What code does that?

> Originally, "struct vmci_event_ctx ev = {0};" could be used to solve this
> problem. After careful analysis, I can clearly see that the data after the
> ev member hdr is not fully initialized, so memset() is used to set the
> uninitialized data after the hdr member in ev to 0.

Again, you have a structure that has 2 structures in it, but no
guarantees that there will not be any padding between those structures:

struct vmci_event_ctx {
        struct vmci_event_msg msg;
        struct vmci_event_payld_ctx payload;
};

Nor do you have any guarantee that those structures don't also have
holes in them.  How does any of this work?  Is it just luck?  I walked
things backwards and find it impossible to guess as to any of the fields
here actually being properly aligned or even using the correct data
types to cross the user/kernel boundary.

And then you throw the whole thing on the stack:

> 248                  struct vmci_event_ctx ev;

And attempt to initialize the fields manually.  What could go wrong?
(hint, syzbot showed what went wrong, and the compiler is now telling
you how your proposed fix is not correct in the long-run...)

Please fix this properly.

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Lizhi Xu]

On Thu, 3 Jul 2025 13:20:47 +0200, Greg KH wrote:
> > Please read the context carefully, and you will understand that this is
> > where everything starts.
> 
> I'm sorry, but I do not understand your quoting style.  Didn't the links
> I provided earlier explain this?
> 
> > In the code before memset, the ev variable only
> > initializes the members of its member hdr.
> 
> What code does that?
    static int ctx_fire_notification(u32 context_id, u32 priv_flags)
...	
   5                 struct vmci_event_ctx ev;
   4
   3                 ev.msg.hdr.dst = vmci_handle_arr_get_entry(subscriber_array, i);
   2                 ev.msg.hdr.src = vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID,
   1                                                   VMCI_CONTEXT_RESOURCE_ID);
253                  ev.msg.hdr.payload_size = sizeof(ev) - sizeof(ev.msg.hdr);
> 
> > Originally, "struct vmci_event_ctx ev = {0};" could be used to solve this
> > problem. After careful analysis, I can clearly see that the data after the
> > ev member hdr is not fully initialized, so memset() is used to set the
> > uninitialized data after the hdr member in ev to 0.
> 
> Again, you have a structure that has 2 structures in it, but no
> guarantees that there will not be any padding between those structures:
> 
> struct vmci_event_ctx {
>         struct vmci_event_msg msg;
>         struct vmci_event_payld_ctx payload;
> };
> 
> Nor do you have any guarantee that those structures don't also have
> holes in them.  How does any of this work?  Is it just luck?  I walked
> things backwards and find it impossible to guess as to any of the fields
> here actually being properly aligned or even using the correct data
> types to cross the user/kernel boundary.
> 
> And then you throw the whole thing on the stack:
> 
> > 248                  struct vmci_event_ctx ev;
1.
struct vmci_event_msg and struct vmci_event_payld_ctx, those struct are
used to contain data for events.
Size of this struct is a multiple of 8 bytes.
So no hole.

2. 
ev.msg.hdr.payload_size = sizeof(ev) - sizeof(ev.msg.hdr);
It means:
2.1 ev.msg.hdr.payload_size is sizeof(struct vmci_event_ctx) - sizeof(struct vmci_datagram)
2.2 The size of payload_size is fixed.

3.
Yes, they are on the stack now.
ctx_fire_notification()->
  vmci_datagram_dispatch()->
    dg_dispatch_as_host()->

Before the datagram is queued in dg_dispatch_as_host(), a copy of the
datagram in the stack is made using kmemdup() and then queued.

4.
Before they all enter the queue, they are in the data preparation stage,
the actual event datagram is not really saved, and the size of payload_size
is fixed, so it is clear that except for hdr, setting the payload content
to 0 before initializing other data will not introduce any unknown behavior.
> 
> And attempt to initialize the fields manually.  What could go wrong?
> (hint, syzbot showed what went wrong, and the compiler is now telling
> you how your proposed fix is not correct in the long-run...)

BR,
Lizhi

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

In file included from include/linux/string.h:392,
                 from include/linux/bitmap.h:13,
                 from include/linux/cpumask.h:12,
                 from arch/x86/include/asm/paravirt.h:21,
                 from arch/x86/include/asm/irqflags.h:102,
                 from include/linux/irqflags.h:18,
                 from include/linux/spinlock.h:59,
                 from include/linux/wait.h:9,
                 from include/linux/wait_bit.h:8,
                 from include/linux/fs.h:7,
                 from include/linux/highmem.h:5,
                 from drivers/misc/vmw_vmci/vmci_context.c:10:
In function 'fortify_memset_chk',
    inlined from 'ctx_fire_notification.isra' at drivers/misc/vmw_vmci/vmci_context.c:254:3:
include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
  480 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  bfb4cf9fb97e ("vmci: Prevent the dispatching of uninitialized payloads")

I have used the char-misc tree from next-20250702 for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Thu, Jul 03, 2025 at 05:10:21PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/string.h:392,
>                  from include/linux/bitmap.h:13,
>                  from include/linux/cpumask.h:12,
>                  from arch/x86/include/asm/paravirt.h:21,
>                  from arch/x86/include/asm/irqflags.h:102,
>                  from include/linux/irqflags.h:18,
>                  from include/linux/spinlock.h:59,
>                  from include/linux/wait.h:9,
>                  from include/linux/wait_bit.h:8,
>                  from include/linux/fs.h:7,
>                  from include/linux/highmem.h:5,
>                  from drivers/misc/vmw_vmci/vmci_context.c:10:
> In function 'fortify_memset_chk',
>     inlined from 'ctx_fire_notification.isra' at drivers/misc/vmw_vmci/vmci_context.c:254:3:
> include/linux/fortify-string.h:480:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
>   480 |                         __write_overflow_field(p_size_field, size);
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   bfb4cf9fb97e ("vmci: Prevent the dispatching of uninitialized payloads")

Ah, nice catch!  Sorry this didn't trigger in my testing.

Yes, it looks like both the code is correct, AND the warning is correct
as the compiler has no idea that you can just scribble off the end of
the structure like this.  In fact I would say the code is wrong as there
could be padding between the two fields that the change doesn't handle
properly (which in reality probably isn't happening).

Lizhi, I'm going to revert this change now, please fix it up "properly"
either by correctly changing the structure definition to show that the
payload is hanging out after the header (and also you can use the
__counted_by mark), or just properly zapping out the payload length in
the proper way instead of doing "fun" pointer math like your change did.

thanks,

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/hv/vmbus_drv.c:1893:22: error: initialization of 'const struct bin_attribute * const*' from incompatible pointer type 'struct bin_attribute **' [-Wincompatible-pointer-types]
 1893 |         .bin_attrs = vmbus_chan_bin_attrs,
      |                      ^~~~~~~~~~~~~~~~~~~~
drivers/hv/vmbus_drv.c:1893:22: note: (near initialization for 'vmbus_chan_group.<anonymous>.bin_attrs')

Caused by commit

  f31fe8165d36 ("uio_hv_generic: Fix sysfs creation path for ring buffer")

interacting with commit

  9bec944506fa ("sysfs: constify attribute_group::bin_attrs")

from the driver-core tree.

I have applied the following merge fixup for today.



-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

On Mon, 5 May 2025 16:08:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/hv/vmbus_drv.c:1893:22: error: initialization of 'const struct bin_attribute * const*' from incompatible pointer type 'struct bin_attribute **' [-Wincompatible-pointer-types]
>  1893 |         .bin_attrs = vmbus_chan_bin_attrs,
>       |                      ^~~~~~~~~~~~~~~~~~~~
> drivers/hv/vmbus_drv.c:1893:22: note: (near initialization for 'vmbus_chan_group.<anonymous>.bin_attrs')
> 
> Caused by commit
> 
>   f31fe8165d36 ("uio_hv_generic: Fix sysfs creation path for ring buffer")
> 
> interacting with commit
> 
>   9bec944506fa ("sysfs: constify attribute_group::bin_attrs")
> 
> from the driver-core tree.
> 
> I have applied the following merge fixup for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 May 2025 15:56:12 +1000
Subject: [PATCH] uio_hv_generic: constify bin_attribute definitions

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hv/vmbus_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index e3d51a316316..857109bb99a0 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1815,7 +1815,7 @@ static int hv_mmap_ring_buffer_wrapper(struct file *filp, struct kobject *kobj,
 	return channel->mmap_ring_buffer(channel, vma);
 }
 
-static struct bin_attribute chan_attr_ring_buffer = {
+static const struct bin_attribute chan_attr_ring_buffer = {
 	.attr = {
 		.name = "ring",
 		.mode = 0600,
@@ -1841,7 +1841,7 @@ static struct attribute *vmbus_chan_attrs[] = {
 	NULL
 };
 
-static struct bin_attribute *vmbus_chan_bin_attrs[] = {
+static const struct bin_attribute *vmbus_chan_bin_attrs[] = {
 	&chan_attr_ring_buffer,
 	NULL
 };
-- 
2.47.2

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

On Mon, 5 May 2025 16:12:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 5 May 2025 16:08:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/hv/vmbus_drv.c:1893:22: error: initialization of 'const struct bin_attribute * const*' from incompatible pointer type 'struct bin_attribute **' [-Wincompatible-pointer-types]
> >  1893 |         .bin_attrs = vmbus_chan_bin_attrs,
> >       |                      ^~~~~~~~~~~~~~~~~~~~
> > drivers/hv/vmbus_drv.c:1893:22: note: (near initialization for 'vmbus_chan_group.<anonymous>.bin_attrs')
> > 
> > Caused by commit
> > 
> >   f31fe8165d36 ("uio_hv_generic: Fix sysfs creation path for ring buffer")
> > 
> > interacting with commit
> > 
> >   9bec944506fa ("sysfs: constify attribute_group::bin_attrs")
> > 
> > from the driver-core tree.
> > 
> > I have applied the following merge fixup for today.  
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 5 May 2025 15:56:12 +1000
> Subject: [PATCH] uio_hv_generic: constify bin_attribute definitions
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/hv/vmbus_drv.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
> index e3d51a316316..857109bb99a0 100644
> --- a/drivers/hv/vmbus_drv.c
> +++ b/drivers/hv/vmbus_drv.c
> @@ -1815,7 +1815,7 @@ static int hv_mmap_ring_buffer_wrapper(struct file *filp, struct kobject *kobj,
>  	return channel->mmap_ring_buffer(channel, vma);
>  }
>  
> -static struct bin_attribute chan_attr_ring_buffer = {
> +static const struct bin_attribute chan_attr_ring_buffer = {
>  	.attr = {
>  		.name = "ring",
>  		.mode = 0600,
> @@ -1841,7 +1841,7 @@ static struct attribute *vmbus_chan_attrs[] = {
>  	NULL
>  };
>  
> -static struct bin_attribute *vmbus_chan_bin_attrs[] = {
> +static const struct bin_attribute *vmbus_chan_bin_attrs[] = {
>  	&chan_attr_ring_buffer,
>  	NULL
>  };
> -- 
> 2.47.2

It occurred to me that the above patch could be applied directly to the
char-misc tree if vmbus_chan_bin_attrs was assigned to .bin_attrs_new
instead of .bin_attrs (later in the file), right?
-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Thomas Weißschuh]

Hi Stephen,

On 2025-05-05 17:14:25+1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 5 May 2025 16:12:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 5 May 2025 16:08:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/hv/vmbus_drv.c:1893:22: error: initialization of 'const struct bin_attribute * const*' from incompatible pointer type 'struct bin_attribute **' [-Wincompatible-pointer-types]
> > >  1893 |         .bin_attrs = vmbus_chan_bin_attrs,
> > >       |                      ^~~~~~~~~~~~~~~~~~~~
> > > drivers/hv/vmbus_drv.c:1893:22: note: (near initialization for 'vmbus_chan_group.<anonymous>.bin_attrs')
> > > 
> > > Caused by commit
> > > 
> > >   f31fe8165d36 ("uio_hv_generic: Fix sysfs creation path for ring buffer")
> > > 
> > > interacting with commit
> > > 
> > >   9bec944506fa ("sysfs: constify attribute_group::bin_attrs")
> > > 
> > > from the driver-core tree.
> > > 
> > > I have applied the following merge fixup for today.  
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 5 May 2025 15:56:12 +1000
> > Subject: [PATCH] uio_hv_generic: constify bin_attribute definitions
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/hv/vmbus_drv.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
> > index e3d51a316316..857109bb99a0 100644
> > --- a/drivers/hv/vmbus_drv.c
> > +++ b/drivers/hv/vmbus_drv.c
> > @@ -1815,7 +1815,7 @@ static int hv_mmap_ring_buffer_wrapper(struct file *filp, struct kobject *kobj,
> >  	return channel->mmap_ring_buffer(channel, vma);
> >  }
> >  
> > -static struct bin_attribute chan_attr_ring_buffer = {
> > +static const struct bin_attribute chan_attr_ring_buffer = {
> >  	.attr = {
> >  		.name = "ring",
> >  		.mode = 0600,
> > @@ -1841,7 +1841,7 @@ static struct attribute *vmbus_chan_attrs[] = {
> >  	NULL
> >  };
> >  
> > -static struct bin_attribute *vmbus_chan_bin_attrs[] = {
> > +static const struct bin_attribute *vmbus_chan_bin_attrs[] = {

An additional "const" would be a bit better:

+static const struct bin_attribute *const vmbus_chan_bin_attrs[] = {

Otherwise looks good in general.

> >  	&chan_attr_ring_buffer,
> >  	NULL
> >  };
> > -- 
> > 2.47.2

> It occurred to me that the above patch could be applied directly to the
> char-misc tree if vmbus_chan_bin_attrs was assigned to .bin_attrs_new
> instead of .bin_attrs (later in the file), right?

Yes, that would also work. It will require adaption of the future patch
removing .bin_attrs_new again, but that shouldn't be an issue.


Thomas

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi Thomas,

On Mon, 5 May 2025 09:39:10 +0200 Thomas Weißschuh <linux@weissschuh.net> wrote:
>
> On 2025-05-05 17:14:25+1000, Stephen Rothwell wrote:
> > 
> > On Mon, 5 May 2025 16:12:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > @@ -1841,7 +1841,7 @@ static struct attribute *vmbus_chan_attrs[] = {
> > >  	NULL
> > >  };
> > >  
> > > -static struct bin_attribute *vmbus_chan_bin_attrs[] = {
> > > +static const struct bin_attribute *vmbus_chan_bin_attrs[] = {  
> 
> An additional "const" would be a bit better:
> 
> +static const struct bin_attribute *const vmbus_chan_bin_attrs[] = {

Added for tomorrow.

> Otherwise looks good in general.
> 
> > It occurred to me that the above patch could be applied directly to the
> > char-misc tree if vmbus_chan_bin_attrs was assigned to .bin_attrs_new
> > instead of .bin_attrs (later in the file), right?  
> 
> Yes, that would also work. It will require adaption of the future patch
> removing .bin_attrs_new again, but that shouldn't be an issue.

It would be nice since it will remove a conflict that needs to be
explained to Linus.

Thanks.

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ld: warning: discarding dynamic section .glink
ld: warning: discarding dynamic section .plt
ld: linkage table error against `__kunit_do_failed_assertion'
ld: stubs don't match calculated size
ld: can not build stubs: bad value
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_minor':
misc_minor_kunit.c:(.text+0x180): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x1e4): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x240): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_twice':
misc_minor_kunit.c:(.text+0x3e8): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x458): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x4c4): more undefined references to `__kunit_do_failed_assertion' follow
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_find_minors':
misc_minor_kunit.c:(.text+0xb3c): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xbac): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xc1c): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xc88): undefined reference to `kunit_log_append'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_name':
misc_minor_kunit.c:(.text+0xee4): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0xf40): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0xf90): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_error':
misc_minor_kunit.c:(.text+0x11b4): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x1210): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x1264): more undefined references to `__kunit_do_failed_assertion' follow
ld: drivers/misc/misc_minor_kunit.o:(.toc+0x0): undefined reference to `kunit_binary_assert_format'
ld: drivers/misc/misc_minor_kunit.o:(.toc+0x8): undefined reference to `kunit_fail_assert_format'
ld: drivers/misc/misc_minor_kunit.o:(.toc+0x10): undefined reference to `kunit_unary_assert_format'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_can_open':
misc_minor_kunit.c:(.init.text+0xc0): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x134): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_static_basic':
misc_minor_kunit.c:(.init.text+0x25c): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x2b4): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict_reverse':
misc_minor_kunit.c:(.init.text+0x408): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x414): undefined reference to `__kunit_abort'
ld: misc_minor_kunit.c:(.init.text+0x46c): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x4d8): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x530): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x590): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x5e4): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.init.text+0x63c): more undefined references to `__kunit_do_failed_assertion' follow
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict':
misc_minor_kunit.c:(.init.text+0x7a0): undefined reference to `__kunit_abort'
ld: misc_minor_kunit.c:(.init.text+0x7f8): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x85c): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_basic':
misc_minor_kunit.c:(.init.text+0x994): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x9ec): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision_reverse':
misc_minor_kunit.c:(.init.text+0xb20): undefined reference to `kunit_kmalloc_array'
ld: misc_minor_kunit.c:(.init.text+0xba8): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0xc00): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0xc64): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0xcc0): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision':
misc_minor_kunit.c:(.init.text+0xe30): undefined reference to `kunit_kmalloc_array'
ld: misc_minor_kunit.c:(.init.text+0xe98): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0xea4): undefined reference to `__kunit_abort'
ld: misc_minor_kunit.c:(.init.text+0xf04): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0xfac): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x1058): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_only_range':
misc_minor_kunit.c:(.init.text+0x1174): undefined reference to `kunit_kmalloc_array'
ld: misc_minor_kunit.c:(.init.text+0x1200): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x1248): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.init.text+0x12ec): undefined reference to `__kunit_do_failed_assertion'

Caused by commit

  20acf4dd46e4 ("char: misc: make miscdevice unit test built-in only")

$ grep CONFIG_KUNIT .config
CONFIG_KUNIT=m
CONFIG_KUNIT_DEBUGFS=y
CONFIG_KUNIT_FAULT_TEST=y
CONFIG_KUNIT_TEST=m
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEFAULT_ENABLED=y
CONFIG_KUNIT_AUTORUN_ENABLED=y
$ grep CONFIG_TEST_MINOR .config
$ 

I have used the char-misc tree from next-20250428 again.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Thu, May 01, 2025 at 04:45:01PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ld: warning: discarding dynamic section .glink
> ld: warning: discarding dynamic section .plt
> ld: linkage table error against `__kunit_do_failed_assertion'
> ld: stubs don't match calculated size
> ld: can not build stubs: bad value
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_minor':
> misc_minor_kunit.c:(.text+0x180): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x1e4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x240): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_twice':
> misc_minor_kunit.c:(.text+0x3e8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x458): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x4c4): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_find_minors':
> misc_minor_kunit.c:(.text+0xb3c): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xbac): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xc1c): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xc88): undefined reference to `kunit_log_append'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_name':
> misc_minor_kunit.c:(.text+0xee4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0xf40): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0xf90): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_error':
> misc_minor_kunit.c:(.text+0x11b4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x1210): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x1264): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x0): undefined reference to `kunit_binary_assert_format'
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x8): undefined reference to `kunit_fail_assert_format'
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x10): undefined reference to `kunit_unary_assert_format'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_can_open':
> misc_minor_kunit.c:(.init.text+0xc0): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x134): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_static_basic':
> misc_minor_kunit.c:(.init.text+0x25c): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x2b4): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict_reverse':
> misc_minor_kunit.c:(.init.text+0x408): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x414): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0x46c): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x4d8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x530): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x590): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x5e4): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.init.text+0x63c): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict':
> misc_minor_kunit.c:(.init.text+0x7a0): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0x7f8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x85c): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_basic':
> misc_minor_kunit.c:(.init.text+0x994): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x9ec): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision_reverse':
> misc_minor_kunit.c:(.init.text+0xb20): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0xba8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xc00): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xc64): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xcc0): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision':
> misc_minor_kunit.c:(.init.text+0xe30): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0xe98): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xea4): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0xf04): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xfac): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x1058): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_only_range':
> misc_minor_kunit.c:(.init.text+0x1174): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0x1200): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x1248): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x12ec): undefined reference to `__kunit_do_failed_assertion'
> 
> Caused by commit
> 
>   20acf4dd46e4 ("char: misc: make miscdevice unit test built-in only")
> 
> $ grep CONFIG_KUNIT .config
> CONFIG_KUNIT=m
> CONFIG_KUNIT_DEBUGFS=y
> CONFIG_KUNIT_FAULT_TEST=y
> CONFIG_KUNIT_TEST=m
> CONFIG_KUNIT_EXAMPLE_TEST=m
> CONFIG_KUNIT_ALL_TESTS=m
> CONFIG_KUNIT_DEFAULT_ENABLED=y
> CONFIG_KUNIT_AUTORUN_ENABLED=y
> $ grep CONFIG_TEST_MINOR .config
> $ 
> 
> I have used the char-misc tree from next-20250428 again.

Ugh, ok, I'm just going to revert these changes from my tree again.
Sorry about this.

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Thadeu Lima de Souza Cascardo]

On Thu, May 01, 2025 at 04:45:01PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ld: warning: discarding dynamic section .glink
> ld: warning: discarding dynamic section .plt
> ld: linkage table error against `__kunit_do_failed_assertion'
> ld: stubs don't match calculated size
> ld: can not build stubs: bad value
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_minor':
> misc_minor_kunit.c:(.text+0x180): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x1e4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x240): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_twice':
> misc_minor_kunit.c:(.text+0x3e8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x458): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x4c4): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_find_minors':
> misc_minor_kunit.c:(.text+0xb3c): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xbac): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xc1c): undefined reference to `kunit_log_append'
> ld: misc_minor_kunit.c:(.text+0xc88): undefined reference to `kunit_log_append'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_name':
> misc_minor_kunit.c:(.text+0xee4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0xf40): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0xf90): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_error':
> misc_minor_kunit.c:(.text+0x11b4): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.text+0x1210): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x1264): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x0): undefined reference to `kunit_binary_assert_format'
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x8): undefined reference to `kunit_fail_assert_format'
> ld: drivers/misc/misc_minor_kunit.o:(.toc+0x10): undefined reference to `kunit_unary_assert_format'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_can_open':
> misc_minor_kunit.c:(.init.text+0xc0): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x134): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_static_basic':
> misc_minor_kunit.c:(.init.text+0x25c): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x2b4): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict_reverse':
> misc_minor_kunit.c:(.init.text+0x408): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x414): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0x46c): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x4d8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x530): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x590): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x5e4): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.init.text+0x63c): more undefined references to `__kunit_do_failed_assertion' follow
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict':
> misc_minor_kunit.c:(.init.text+0x7a0): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0x7f8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x85c): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_basic':
> misc_minor_kunit.c:(.init.text+0x994): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x9ec): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision_reverse':
> misc_minor_kunit.c:(.init.text+0xb20): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0xba8): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xc00): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xc64): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xcc0): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision':
> misc_minor_kunit.c:(.init.text+0xe30): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0xe98): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xea4): undefined reference to `__kunit_abort'
> ld: misc_minor_kunit.c:(.init.text+0xf04): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0xfac): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x1058): undefined reference to `__kunit_do_failed_assertion'
> ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_only_range':
> misc_minor_kunit.c:(.init.text+0x1174): undefined reference to `kunit_kmalloc_array'
> ld: misc_minor_kunit.c:(.init.text+0x1200): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x1248): undefined reference to `__kunit_do_failed_assertion'
> ld: misc_minor_kunit.c:(.init.text+0x12ec): undefined reference to `__kunit_do_failed_assertion'
> 
> Caused by commit
> 
>   20acf4dd46e4 ("char: misc: make miscdevice unit test built-in only")
> 
> $ grep CONFIG_KUNIT .config
> CONFIG_KUNIT=m
> CONFIG_KUNIT_DEBUGFS=y
> CONFIG_KUNIT_FAULT_TEST=y
> CONFIG_KUNIT_TEST=m
> CONFIG_KUNIT_EXAMPLE_TEST=m
> CONFIG_KUNIT_ALL_TESTS=m
> CONFIG_KUNIT_DEFAULT_ENABLED=y
> CONFIG_KUNIT_AUTORUN_ENABLED=y
> $ grep CONFIG_TEST_MINOR .config
> $ 
> 
> I have used the char-misc tree from next-20250428 again.
> 
> -- 
> Cheers,
> Stephen Rothwell

This should fix it. I am sorry for still breaking all these builds. I have
tested this with the ppc64_defconfig (though that had required me to "fix" a
couple of warnings-turned-to-errors under arch/powerpc/). As I am trying to fix
this quickly, I haven't checked other configs. Again, I am sorry for the trouble.

Greg, I understand this may have caused you concern about merging this. Let
me know if you want to apply the fix below and have me submit it properly
or if we should wait for another cycle before applying a v5 after further
testing.

Cascardo.


From 9e3150cb663e17b748cce6373c2f2b491a14b1a3 Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Date: Wed, 30 Apr 2025 08:30:47 -0300
Subject: [PATCH] char: misc: make miscdevice unit test require CONFIG_KUNIT=y

Otherwise, it allows for CONFIG_KUNIT=m, and that leads to build failures
like:

ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_minor':
misc_minor_kunit.c:(.text+0x180): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x1e4): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x240): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_twice':
misc_minor_kunit.c:(.text+0x3e8): undefined reference to `__kunit_do_failed_assertion'
ld: misc_minor_kunit.c:(.text+0x458): undefined reference to `__kunit_do_failed_assertion'
ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x4c4): more undefined references to `__kunit_do_failed_assertion' follow
ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_find_minors':
misc_minor_kunit.c:(.text+0xb3c): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xbac): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xc1c): undefined reference to `kunit_log_append'
ld: misc_minor_kunit.c:(.text+0xc88): undefined reference to `kunit_log_append'

[...]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/linux-next/20250501164501.0fc0ab68@canb.auug.org.au/
Fixes: 45f0de4f8dc3 ("char: misc: add test cases")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
---
 lib/Kconfig.debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0117b852bd13..4049851e5115 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2513,7 +2513,7 @@ config TEST_IDA
 
 config TEST_MISC_MINOR
 	bool "miscdevice KUnit test" if !KUNIT_ALL_TESTS
-	depends on KUNIT
+	depends on KUNIT=y
 	default KUNIT_ALL_TESTS
 	help
 	  Kunit test for miscdevice API, specially its behavior in respect to
-- 
2.47.2

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Thu, May 01, 2025 at 07:15:09AM -0300, Thadeu Lima de Souza Cascardo wrote:
> On Thu, May 01, 2025 at 04:45:01PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > ld: warning: discarding dynamic section .glink
> > ld: warning: discarding dynamic section .plt
> > ld: linkage table error against `__kunit_do_failed_assertion'
> > ld: stubs don't match calculated size
> > ld: can not build stubs: bad value
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_minor':
> > misc_minor_kunit.c:(.text+0x180): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0x1e4): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0x240): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_twice':
> > misc_minor_kunit.c:(.text+0x3e8): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0x458): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x4c4): more undefined references to `__kunit_do_failed_assertion' follow
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_find_minors':
> > misc_minor_kunit.c:(.text+0xb3c): undefined reference to `kunit_log_append'
> > ld: misc_minor_kunit.c:(.text+0xbac): undefined reference to `kunit_log_append'
> > ld: misc_minor_kunit.c:(.text+0xc1c): undefined reference to `kunit_log_append'
> > ld: misc_minor_kunit.c:(.text+0xc88): undefined reference to `kunit_log_append'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_name':
> > misc_minor_kunit.c:(.text+0xee4): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0xf40): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0xf90): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_duplicate_error':
> > misc_minor_kunit.c:(.text+0x11b4): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.text+0x1210): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.text+0x1264): more undefined references to `__kunit_do_failed_assertion' follow
> > ld: drivers/misc/misc_minor_kunit.o:(.toc+0x0): undefined reference to `kunit_binary_assert_format'
> > ld: drivers/misc/misc_minor_kunit.o:(.toc+0x8): undefined reference to `kunit_fail_assert_format'
> > ld: drivers/misc/misc_minor_kunit.o:(.toc+0x10): undefined reference to `kunit_unary_assert_format'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_can_open':
> > misc_minor_kunit.c:(.init.text+0xc0): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x134): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_static_basic':
> > misc_minor_kunit.c:(.init.text+0x25c): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x2b4): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict_reverse':
> > misc_minor_kunit.c:(.init.text+0x408): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x414): undefined reference to `__kunit_abort'
> > ld: misc_minor_kunit.c:(.init.text+0x46c): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x4d8): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x530): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x590): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x5e4): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o:misc_minor_kunit.c:(.init.text+0x63c): more undefined references to `__kunit_do_failed_assertion' follow
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_conflict':
> > misc_minor_kunit.c:(.init.text+0x7a0): undefined reference to `__kunit_abort'
> > ld: misc_minor_kunit.c:(.init.text+0x7f8): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x85c): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_basic':
> > misc_minor_kunit.c:(.init.text+0x994): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x9ec): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision_reverse':
> > misc_minor_kunit.c:(.init.text+0xb20): undefined reference to `kunit_kmalloc_array'
> > ld: misc_minor_kunit.c:(.init.text+0xba8): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0xc00): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0xc64): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0xcc0): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_collision':
> > misc_minor_kunit.c:(.init.text+0xe30): undefined reference to `kunit_kmalloc_array'
> > ld: misc_minor_kunit.c:(.init.text+0xe98): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0xea4): undefined reference to `__kunit_abort'
> > ld: misc_minor_kunit.c:(.init.text+0xf04): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0xfac): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x1058): undefined reference to `__kunit_do_failed_assertion'
> > ld: drivers/misc/misc_minor_kunit.o: in function `miscdev_test_dynamic_only_range':
> > misc_minor_kunit.c:(.init.text+0x1174): undefined reference to `kunit_kmalloc_array'
> > ld: misc_minor_kunit.c:(.init.text+0x1200): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x1248): undefined reference to `__kunit_do_failed_assertion'
> > ld: misc_minor_kunit.c:(.init.text+0x12ec): undefined reference to `__kunit_do_failed_assertion'
> > 
> > Caused by commit
> > 
> >   20acf4dd46e4 ("char: misc: make miscdevice unit test built-in only")
> > 
> > $ grep CONFIG_KUNIT .config
> > CONFIG_KUNIT=m
> > CONFIG_KUNIT_DEBUGFS=y
> > CONFIG_KUNIT_FAULT_TEST=y
> > CONFIG_KUNIT_TEST=m
> > CONFIG_KUNIT_EXAMPLE_TEST=m
> > CONFIG_KUNIT_ALL_TESTS=m
> > CONFIG_KUNIT_DEFAULT_ENABLED=y
> > CONFIG_KUNIT_AUTORUN_ENABLED=y
> > $ grep CONFIG_TEST_MINOR .config
> > $ 
> > 
> > I have used the char-misc tree from next-20250428 again.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> 
> This should fix it. I am sorry for still breaking all these builds. I have
> tested this with the ppc64_defconfig (though that had required me to "fix" a
> couple of warnings-turned-to-errors under arch/powerpc/). As I am trying to fix
> this quickly, I haven't checked other configs. Again, I am sorry for the trouble.
> 
> Greg, I understand this may have caused you concern about merging this. Let
> me know if you want to apply the fix below and have me submit it properly
> or if we should wait for another cycle before applying a v5 after further
> testing.

Let me revert for now and please submit after the next -rc1 is out and
more testing can happen.

thanks,

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: modpost: "init_mknod" [drivers/misc/misc_minor_kunit.ko] undefined!
ERROR: modpost: "init_unlink" [drivers/misc/misc_minor_kunit.ko] undefined!

Caused by commit

  45f0de4f8dc3 ("char: misc: add test cases")

I have used the char-misc tree from next-20250428 for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Thadeu Lima de Souza Cascardo]

On Tue, Apr 29, 2025 at 03:54:04PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: modpost: "init_mknod" [drivers/misc/misc_minor_kunit.ko] undefined!
> ERROR: modpost: "init_unlink" [drivers/misc/misc_minor_kunit.ko] undefined!
> 
> Caused by commit
> 
>   45f0de4f8dc3 ("char: misc: add test cases")
> 
> I have used the char-misc tree from next-20250428 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

Hi, Stephen, thanks for bringing this up.

I fixed a similar issue, because the functions calling init_mknod and
init_unlink were not __init functions. But it seems those symbols are not
exported, so I might need to restrict the test module to be built-in.

Let me test that and get back to you.

Cascardo.

Re: linux-next: build failure after merge of the char-misc tree

[Thadeu Lima de Souza Cascardo]

On Tue, Apr 29, 2025 at 03:54:04PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: modpost: "init_mknod" [drivers/misc/misc_minor_kunit.ko] undefined!
> ERROR: modpost: "init_unlink" [drivers/misc/misc_minor_kunit.ko] undefined!
> 
> Caused by commit
> 
>   45f0de4f8dc3 ("char: misc: add test cases")
> 
> I have used the char-misc tree from next-20250428 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

Hi, Greg.

I have a fix for this one. How stable is char-misc-next? Should I include a
Fixes: line referring to this commit ID? Or is there a chance
char-misc-next would be rebased or the commit dropped, making the ID
invalid?

Or would you rather that I submit a v5?

Thanks.
Cascardo.

Re: linux-next: build failure after merge of the char-misc tree

[Greg Kroah-Hartman]

On Wed, Apr 30, 2025 at 09:16:56AM -0300, Thadeu Lima de Souza Cascardo wrote:
> On Tue, Apr 29, 2025 at 03:54:04PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > ERROR: modpost: "init_mknod" [drivers/misc/misc_minor_kunit.ko] undefined!
> > ERROR: modpost: "init_unlink" [drivers/misc/misc_minor_kunit.ko] undefined!
> > 
> > Caused by commit
> > 
> >   45f0de4f8dc3 ("char: misc: add test cases")
> > 
> > I have used the char-misc tree from next-20250428 for today.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> 
> Hi, Greg.
> 
> I have a fix for this one. How stable is char-misc-next? Should I include a
> Fixes: line referring to this commit ID? Or is there a chance
> char-misc-next would be rebased or the commit dropped, making the ID
> invalid?

It does not get rebased, so send a fix, otherwise if you:

> Or would you rather that I submit a v5?

Do that then I need to do a revert, and then add you v5.  So a fix would
be simplest, thanks!

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

make[4]: *** Deleting file 'drivers/accessibility/speakup/mapdata.h'
can't open ./include/linux/input.h
make[4]: *** [/home/sfr/next/next/drivers/accessibility/speakup/Makefile:46: drivers/accessibility/speakup/mapdata.h] Error 1
make[3]: *** [/home/sfr/next/next/scripts/Makefile.build:542: drivers/accessibility/speakup] Error 2

Caused by commit

  6646b95aab5f ("speakup: Generate speakupmap.h automatically")

I have used the char-misc tree from next-20220519 for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Fri, May 20, 2022 at 07:46:37PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the soundwire tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> make[4]: *** Deleting file 'drivers/accessibility/speakup/mapdata.h'
> can't open ./include/linux/input.h
> make[4]: *** [/home/sfr/next/next/drivers/accessibility/speakup/Makefile:46: drivers/accessibility/speakup/mapdata.h] Error 1
> make[3]: *** [/home/sfr/next/next/scripts/Makefile.build:542: drivers/accessibility/speakup] Error 2
> 
> Caused by commit
> 
>   6646b95aab5f ("speakup: Generate speakupmap.h automatically")
> 
> I have used the char-misc tree from next-20220519 for today.

Ugh, odd, this worked for me.  I'll go revert this.  Samuel, can you
rework this again?

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Samuel Thibault]

Greg KH, le ven. 20 mai 2022 21:08:13 +0200, a ecrit:
> On Fri, May 20, 2022 at 07:46:37PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the soundwire tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > make[4]: *** Deleting file 'drivers/accessibility/speakup/mapdata.h'
> > can't open ./include/linux/input.h
> > make[4]: *** [/home/sfr/next/next/drivers/accessibility/speakup/Makefile:46: drivers/accessibility/speakup/mapdata.h] Error 1
> > make[3]: *** [/home/sfr/next/next/scripts/Makefile.build:542: drivers/accessibility/speakup] Error 2
> > 
> > Caused by commit
> > 
> >   6646b95aab5f ("speakup: Generate speakupmap.h automatically")
> > 
> > I have used the char-misc tree from next-20220519 for today.
> 
> Ugh, odd, this worked for me.

Ah, that's about out-of-tree builds.

> I'll go revert this.  Samuel, can you rework this again?

Yes, I have submitted a fixed patch.

Samuel

linux-next: build failure after merge of the char-misc tree

[broonie]

Hi all,

After merging the char-misc tree, today's linux-next build (x86
allmodconfig) failed like this:

/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sd_request':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:809:17: error: unused variable 'dev' [-Werror=unused-variable]
  809 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_set_ios':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1084:17: error: unused variable 'dev' [-Werror=unused-variable]
 1084 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_ro':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1133:17: error: unused variable 'dev' [-Werror=unused-variable]
 1133 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_cd':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1159:17: error: unused variable 'dev' [-Werror=unused-variable]
 1159 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_switch_voltage':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1258:17: error: unused variable 'dev' [-Werror=unused-variable]
 1258 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_execute_tuning':
/tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1311:17: error: unused variable 'dev' [-Werror=unused-variable]
 1311 |  struct device *dev = &host->pdev->dev;
      |                 ^~~
cc1: all warnings being treated as errors

Caused by commit

  7570fb41e450ba37 ("mmc: rtsx: Let MMC core handle runtime PM")

I have used the char-misc tree from yesterday instead.

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Fri, Feb 25, 2022 at 08:40:55PM +0000, broonie@kernel.org wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86
> allmodconfig) failed like this:
> 
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sd_request':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:809:17: error: unused variable 'dev' [-Werror=unused-variable]
>   809 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_set_ios':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1084:17: error: unused variable 'dev' [-Werror=unused-variable]
>  1084 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_ro':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1133:17: error: unused variable 'dev' [-Werror=unused-variable]
>  1133 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_cd':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1159:17: error: unused variable 'dev' [-Werror=unused-variable]
>  1159 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_switch_voltage':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1258:17: error: unused variable 'dev' [-Werror=unused-variable]
>  1258 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_execute_tuning':
> /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1311:17: error: unused variable 'dev' [-Werror=unused-variable]
>  1311 |  struct device *dev = &host->pdev->dev;
>       |                 ^~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   7570fb41e450ba37 ("mmc: rtsx: Let MMC core handle runtime PM")
> 
> I have used the char-misc tree from yesterday instead.

Kai-Heng, can you send an add-on patch to fix this?

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

On Sat, 26 Feb 2022 16:08:32 +0100 Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Fri, Feb 25, 2022 at 08:40:55PM +0000, broonie@kernel.org wrote:
> > 
> > After merging the char-misc tree, today's linux-next build (x86
> > allmodconfig) failed like this:
> > 
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sd_request':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:809:17: error: unused variable 'dev' [-Werror=unused-variable]
> >   809 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_set_ios':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1084:17: error: unused variable 'dev' [-Werror=unused-variable]
> >  1084 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_ro':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1133:17: error: unused variable 'dev' [-Werror=unused-variable]
> >  1133 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_cd':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1159:17: error: unused variable 'dev' [-Werror=unused-variable]
> >  1159 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_switch_voltage':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1258:17: error: unused variable 'dev' [-Werror=unused-variable]
> >  1258 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_execute_tuning':
> > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1311:17: error: unused variable 'dev' [-Werror=unused-variable]
> >  1311 |  struct device *dev = &host->pdev->dev;
> >       |                 ^~~
> > cc1: all warnings being treated as errors
> > 
> > Caused by commit
> > 
> >   7570fb41e450ba37 ("mmc: rtsx: Let MMC core handle runtime PM")
> > 
> > I have used the char-misc tree from yesterday instead.  
> 
> Kai-Heng, can you send an add-on patch to fix this?
> 
> thanks,

I am still getting these build errors.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Tue, Mar 01, 2022 at 04:14:26PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Sat, 26 Feb 2022 16:08:32 +0100 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Fri, Feb 25, 2022 at 08:40:55PM +0000, broonie@kernel.org wrote:
> > > 
> > > After merging the char-misc tree, today's linux-next build (x86
> > > allmodconfig) failed like this:
> > > 
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sd_request':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:809:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >   809 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_set_ios':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1084:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >  1084 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_ro':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1133:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >  1133 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_get_cd':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1159:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >  1159 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_switch_voltage':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1258:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >  1258 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c: In function 'sdmmc_execute_tuning':
> > > /tmp/next/build/drivers/mmc/host/rtsx_pci_sdmmc.c:1311:17: error: unused variable 'dev' [-Werror=unused-variable]
> > >  1311 |  struct device *dev = &host->pdev->dev;
> > >       |                 ^~~
> > > cc1: all warnings being treated as errors
> > > 
> > > Caused by commit
> > > 
> > >   7570fb41e450ba37 ("mmc: rtsx: Let MMC core handle runtime PM")
> > > 
> > > I have used the char-misc tree from yesterday instead.  
> > 
> > Kai-Heng, can you send an add-on patch to fix this?
> > 
> > thanks,
> 
> I am still getting these build errors.

Should now be fixed, sorry for the delay.

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.

Caused by commit

  16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Oct 2021 15:44:18 +1100
Subject: [PATCH] fix for "dma-buf: move dma-buf symbols into the DMA_BUF
 module namespace"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 57ceecb3f4d8..f7324582afe7 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -22,6 +22,8 @@
 #include <drm/drm_prime.h>
 #include <drm/drm_print.h>
 
+MODULE_IMPORT_NS(DMA_BUF);
+
 /**
  * DOC: overview
  *
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Wed, Oct 27, 2021 at 03:48:43PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
> ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
> ERROR: modpost: module drm_shmem_helper uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.
> 
> Caused by commit
> 
>   16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 27 Oct 2021 15:44:18 +1100
> Subject: [PATCH] fix for "dma-buf: move dma-buf symbols into the DMA_BUF
>  module namespace"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 57ceecb3f4d8..f7324582afe7 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -22,6 +22,8 @@
>  #include <drm/drm_prime.h>
>  #include <drm/drm_print.h>
>  
> +MODULE_IMPORT_NS(DMA_BUF);
> +
>  /**
>   * DOC: overview
>   *
> -- 
> 2.33.0
> 
> -- 
> Cheers,
> Stephen Rothwell



Looks good, I'll go apply this to my tree to keep things building
properly.

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

In file included from drivers/misc/habanalabs/goya/goya.c:8:
drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
   12 | #include "habanalabs.h"
      |          ^~~~~~~~~~~~~~
In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
   12 | #include "habanalabs.h"
      |          ^~~~~~~~~~~~~~

Presumably caused by commit

  70b2f993ea4a ("habanalabs: create common folder")

I have used the char-misc tree from next-20200724 for today.
-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/misc/habanalabs/goya/goya.c:8:
> drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
>    12 | #include "habanalabs.h"
>       |          ^~~~~~~~~~~~~~
> In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
>    12 | #include "habanalabs.h"
>       |          ^~~~~~~~~~~~~~
> 
> Presumably caused by commit
> 
>   70b2f993ea4a ("habanalabs: create common folder")
> 
> I have used the char-misc tree from next-20200724 for today.

Ugh, this is a mess of a merge with this driver.

Oded, I'll take Stephen's merge resolutions here and push out a new
version, and try to resolve this error, but if you could verify I got it
correct, that would be great.

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Oded Gabbay]

On Mon, Jul 27, 2020 at 12:24 PM Greg KH <greg@kroah.com> wrote:
>
> On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> >    12 | #include "habanalabs.h"
> >       |          ^~~~~~~~~~~~~~
> > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> >    12 | #include "habanalabs.h"
> >       |          ^~~~~~~~~~~~~~
> >
> > Presumably caused by commit
> >
> >   70b2f993ea4a ("habanalabs: create common folder")
> >
> > I have used the char-misc tree from next-20200724 for today.
>
> Ugh, this is a mess of a merge with this driver.
>
> Oded, I'll take Stephen's merge resolutions here and push out a new
> version, and try to resolve this error, but if you could verify I got it
> correct, that would be great.
>
> thanks,
>
> greg k-h

Sure, np. Just point me where to look.
Oded

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Mon, Jul 27, 2020 at 12:28:14PM +0300, Oded Gabbay wrote:
> On Mon, Jul 27, 2020 at 12:24 PM Greg KH <greg@kroah.com> wrote:
> >
> > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > >    12 | #include "habanalabs.h"
> > >       |          ^~~~~~~~~~~~~~
> > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > >    12 | #include "habanalabs.h"
> > >       |          ^~~~~~~~~~~~~~
> > >
> > > Presumably caused by commit
> > >
> > >   70b2f993ea4a ("habanalabs: create common folder")
> > >
> > > I have used the char-misc tree from next-20200724 for today.
> >
> > Ugh, this is a mess of a merge with this driver.
> >
> > Oded, I'll take Stephen's merge resolutions here and push out a new
> > version, and try to resolve this error, but if you could verify I got it
> > correct, that would be great.
> >
> > thanks,
> >
> > greg k-h
> 
> Sure, np. Just point me where to look.

I didn't see the above build issue, but maybe I didn't have the right
configuration options enabled for my build.

Oded, I've done the merge and pushed it out to my char-misc-next branch,
let me know if I've messed anything up there.

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Oded Gabbay]

On Mon, Jul 27, 2020 at 1:05 PM Greg KH <greg@kroah.com> wrote:
>
> On Mon, Jul 27, 2020 at 12:28:14PM +0300, Oded Gabbay wrote:
> > On Mon, Jul 27, 2020 at 12:24 PM Greg KH <greg@kroah.com> wrote:
> > >
> > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > After merging the char-misc tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > >
> > > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > >    12 | #include "habanalabs.h"
> > > >       |          ^~~~~~~~~~~~~~
> > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > >    12 | #include "habanalabs.h"
> > > >       |          ^~~~~~~~~~~~~~
> > > >
> > > > Presumably caused by commit
> > > >
> > > >   70b2f993ea4a ("habanalabs: create common folder")
> > > >
> > > > I have used the char-misc tree from next-20200724 for today.
> > >
> > > Ugh, this is a mess of a merge with this driver.
> > >
> > > Oded, I'll take Stephen's merge resolutions here and push out a new
> > > version, and try to resolve this error, but if you could verify I got it
> > > correct, that would be great.
> > >
> > > thanks,
> > >
> > > greg k-h
> >
> > Sure, np. Just point me where to look.
>
> I didn't see the above build issue, but maybe I didn't have the right
> configuration options enabled for my build.
>
> Oded, I've done the merge and pushed it out to my char-misc-next branch,
> let me know if I've messed anything up there.
>
> thanks,
>
> greg k-h

Looks good, thanks!
Oded

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi Greg,

On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> >    12 | #include "habanalabs.h"
> >       |          ^~~~~~~~~~~~~~
> > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> >    12 | #include "habanalabs.h"
> >       |          ^~~~~~~~~~~~~~
> > 
> > Presumably caused by commit
> > 
> >   70b2f993ea4a ("habanalabs: create common folder")
> > 
> > I have used the char-misc tree from next-20200724 for today.  
> 
> Ugh, this is a mess of a merge with this driver.
> 
> Oded, I'll take Stephen's merge resolutions here and push out a new
> version, and try to resolve this error, but if you could verify I got it
> correct, that would be great.

The conflicts are gone, but I still get these errors.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:
> >
> > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > >    12 | #include "habanalabs.h"
> > >       |          ^~~~~~~~~~~~~~
> > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > >    12 | #include "habanalabs.h"
> > >       |          ^~~~~~~~~~~~~~
> > > 
> > > Presumably caused by commit
> > > 
> > >   70b2f993ea4a ("habanalabs: create common folder")
> > > 
> > > I have used the char-misc tree from next-20200724 for today.  
> > 
> > Ugh, this is a mess of a merge with this driver.
> > 
> > Oded, I'll take Stephen's merge resolutions here and push out a new
> > version, and try to resolve this error, but if you could verify I got it
> > correct, that would be great.
> 
> The conflicts are gone, but I still get these errors.

Very odd, I can not duplicate this at all here.  I just did a clean
checkout of the char-misc-next branch and a full 'make allmodconfig' for
x86_64, and it worked just fine.

Are you sure it's not coming from some other tree?

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi Greg,

On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH <greg@kroah.com> wrote:
>
> On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:  
> > >
> > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:  
> > > > Hi all,
> > > > 
> > > > After merging the char-misc tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > >    12 | #include "habanalabs.h"
> > > >       |          ^~~~~~~~~~~~~~
> > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > >    12 | #include "habanalabs.h"
> > > >       |          ^~~~~~~~~~~~~~
> > > > 
> > > > Presumably caused by commit
> > > > 
> > > >   70b2f993ea4a ("habanalabs: create common folder")
> > > > 
> > > > I have used the char-misc tree from next-20200724 for today.    
> > > 
> > > Ugh, this is a mess of a merge with this driver.
> > > 
> > > Oded, I'll take Stephen's merge resolutions here and push out a new
> > > version, and try to resolve this error, but if you could verify I got it
> > > correct, that would be great.  
> > 
> > The conflicts are gone, but I still get these errors.  
> 
> Very odd, I can not duplicate this at all here.  I just did a clean
> checkout of the char-misc-next branch and a full 'make allmodconfig' for
> x86_64, and it worked just fine.
> 
> Are you sure it's not coming from some other tree?

Do you build with a separate object tree?  I always use make O=...
which makes the difference.  I tested with just your tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH <greg@kroah.com> wrote:
> >
> > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:  
> > > >
> > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:  
> > > > > Hi all,
> > > > > 
> > > > > After merging the char-misc tree, today's linux-next build (x86_64
> > > > > allmodconfig) failed like this:
> > > > > 
> > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > >    12 | #include "habanalabs.h"
> > > > >       |          ^~~~~~~~~~~~~~
> > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > >    12 | #include "habanalabs.h"
> > > > >       |          ^~~~~~~~~~~~~~
> > > > > 
> > > > > Presumably caused by commit
> > > > > 
> > > > >   70b2f993ea4a ("habanalabs: create common folder")
> > > > > 
> > > > > I have used the char-misc tree from next-20200724 for today.    
> > > > 
> > > > Ugh, this is a mess of a merge with this driver.
> > > > 
> > > > Oded, I'll take Stephen's merge resolutions here and push out a new
> > > > version, and try to resolve this error, but if you could verify I got it
> > > > correct, that would be great.  
> > > 
> > > The conflicts are gone, but I still get these errors.  
> > 
> > Very odd, I can not duplicate this at all here.  I just did a clean
> > checkout of the char-misc-next branch and a full 'make allmodconfig' for
> > x86_64, and it worked just fine.
> > 
> > Are you sure it's not coming from some other tree?
> 
> Do you build with a separate object tree?  I always use make O=...
> which makes the difference.  I tested with just your tree.

Ah, no, I do not.  Odd, let me see what kind of crazy they are doing
with include build directives...

thanks for the hint.

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Tue, Jul 28, 2020 at 07:17:05PM +0200, Greg KH wrote:
> On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH <greg@kroah.com> wrote:
> > >
> > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> > > > Hi Greg,
> > > > 
> > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:  
> > > > >
> > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:  
> > > > > > Hi all,
> > > > > > 
> > > > > > After merging the char-misc tree, today's linux-next build (x86_64
> > > > > > allmodconfig) failed like this:
> > > > > > 
> > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > > >    12 | #include "habanalabs.h"
> > > > > >       |          ^~~~~~~~~~~~~~
> > > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > > >    12 | #include "habanalabs.h"
> > > > > >       |          ^~~~~~~~~~~~~~
> > > > > > 
> > > > > > Presumably caused by commit
> > > > > > 
> > > > > >   70b2f993ea4a ("habanalabs: create common folder")
> > > > > > 
> > > > > > I have used the char-misc tree from next-20200724 for today.    
> > > > > 
> > > > > Ugh, this is a mess of a merge with this driver.
> > > > > 
> > > > > Oded, I'll take Stephen's merge resolutions here and push out a new
> > > > > version, and try to resolve this error, but if you could verify I got it
> > > > > correct, that would be great.  
> > > > 
> > > > The conflicts are gone, but I still get these errors.  
> > > 
> > > Very odd, I can not duplicate this at all here.  I just did a clean
> > > checkout of the char-misc-next branch and a full 'make allmodconfig' for
> > > x86_64, and it worked just fine.
> > > 
> > > Are you sure it's not coming from some other tree?
> > 
> > Do you build with a separate object tree?  I always use make O=...
> > which makes the difference.  I tested with just your tree.
> 
> Ah, no, I do not.  Odd, let me see what kind of crazy they are doing
> with include build directives...
> 
> thanks for the hint.

Ok, fix sent out, that should resolve this.

thanks,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Oded Gabbay]

Great, thanks!
Oded

On Tue, Jul 28, 2020 at 8:19 PM Greg KH <greg@kroah.com> wrote:
>
> On Tue, Jul 28, 2020 at 07:17:05PM +0200, Greg KH wrote:
> > On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > >
> > > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH <greg@kroah.com> wrote:
> > > >
> > > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> > > > > Hi Greg,
> > > > >
> > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> wrote:
> > > > > >
> > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote:
> > > > > > > Hi all,
> > > > > > >
> > > > > > > After merging the char-misc tree, today's linux-next build (x86_64
> > > > > > > allmodconfig) failed like this:
> > > > > > >
> > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8:
> > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > > > >    12 | #include "habanalabs.h"
> > > > > > >       |          ^~~~~~~~~~~~~~
> > > > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8:
> > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory
> > > > > > >    12 | #include "habanalabs.h"
> > > > > > >       |          ^~~~~~~~~~~~~~
> > > > > > >
> > > > > > > Presumably caused by commit
> > > > > > >
> > > > > > >   70b2f993ea4a ("habanalabs: create common folder")
> > > > > > >
> > > > > > > I have used the char-misc tree from next-20200724 for today.
> > > > > >
> > > > > > Ugh, this is a mess of a merge with this driver.
> > > > > >
> > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new
> > > > > > version, and try to resolve this error, but if you could verify I got it
> > > > > > correct, that would be great.
> > > > >
> > > > > The conflicts are gone, but I still get these errors.
> > > >
> > > > Very odd, I can not duplicate this at all here.  I just did a clean
> > > > checkout of the char-misc-next branch and a full 'make allmodconfig' for
> > > > x86_64, and it worked just fine.
> > > >
> > > > Are you sure it's not coming from some other tree?
> > >
> > > Do you build with a separate object tree?  I always use make O=...
> > > which makes the difference.  I tested with just your tree.
> >
> > Ah, no, I do not.  Odd, let me see what kind of crazy they are doing
> > with include build directives...
> >
> > thanks for the hint.
>
> Ok, fix sent out, that should resolve this.
>
> thanks,
>
> greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, Friday's linux-next build (arm64
allmodconfig) failed like this:

ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] undefined!
ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] undefined!

Presumably caused by commit

  4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs")

Reported-by: "kernelci.org bot" <bot@kernelci.org>

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

[Just adding cc]

On Mon, 4 May 2020 11:46:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the char-misc tree, Friday's linux-next build (arm64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] undefined!
> ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] undefined!
> 
> Presumably caused by commit
> 
>   4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs")
> 
> Reported-by: "kernelci.org bot" <bot@kernelci.org>

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Mon, May 04, 2020 at 11:47:56AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> [Just adding cc]
> 
> On Mon, 4 May 2020 11:46:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> > 
> > After merging the char-misc tree, Friday's linux-next build (arm64
> > allmodconfig) failed like this:
> > 
> > ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] undefined!
> > ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] undefined!
> > 
> > Presumably caused by commit
> > 
> >   4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs")
> > 
> > Reported-by: "kernelci.org bot" <bot@kernelci.org>

Nathan sent me a patch for this on Friday, sorry I missed it.  I'll
queue it up now, thanks.

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Mon, May 04, 2020 at 07:05:50AM +0000, Rajan Vaja wrote:
> Hi Greg,


A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?

A: No.
Q: Should I include quotations after my reply?

http://daringfireball.net/2007/07/on_top

> Nathan Chancellor <natechancellor@gmail.com> have already submitted
> patch "[PATCH] firmware: xilinx: Export
> zynqmp_pm_fpga_{get_status,load}". Will you take it directly or should
> I merge this change in my patch series and submit a new series?

I just merged that patch a few minutes ago, no need to do anything.

I will note that this is the 2nd problem in this patch series that was
found.  I had to drop this series previously for these same types of
issues, which I thought were fixed this time.  I think you all need to
do a bit more build testing on your end when submitting patches please.

thanks,

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/misc/vmw_balloon.c: In function 'vmballoon_mount':
drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first use in this function); did you mean 'simple_rename'?
   .d_dname = simple_dname,
              ^~~~~~~~~~~~
              simple_rename
drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is reported only once for each function it appears in
drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
  return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
         ^~~~~~~~~~~~
         mount_bdev
drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function with return type 'struct dentry *' makes pointer from integer without a cast [-Wint-conversion]
  return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        BALLOON_VMW_MAGIC);
        ~~~~~~~~~~~~~~~~~~

Caused by commit

  83a8afa72e9c ("vmw_balloon: Compaction support")

interacting with commits

  7e5f7bb08b8c ("unexport simple_dname()")
  8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()")

from the vfs tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Jul 2019 19:17:56 +1000
Subject: [PATCH] convert vmwballoon to use the new mount API

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/vmw_balloon.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 91fa43051535..e8c0f7525f13 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/mount.h>
+#include <linux/pseudo_fs.h>
 #include <linux/balloon_compaction.h>
 #include <linux/vmw_vmci_defs.h>
 #include <linux/vmw_vmci_api.h>
@@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b)
 
 #ifdef CONFIG_BALLOON_COMPACTION
 
-static struct dentry *vmballoon_mount(struct file_system_type *fs_type,
-				      int flags, const char *dev_name,
-				      void *data)
+static int vmballoon_init_fs_context(struct fs_context *fc)
 {
-	static const struct dentry_operations ops = {
-		.d_dname = simple_dname,
-	};
-
-	return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
-			    BALLOON_VMW_MAGIC);
+	return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM;
 }
 
 static struct file_system_type vmballoon_fs = {
 	.name           = "balloon-vmware",
-	.mount          = vmballoon_mount,
+	.init_fs_context          = vmballoon_init_fs_context,
 	.kill_sb        = kill_anon_super,
 };
 
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

On Mon, 8 Jul 2019 19:23:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/misc/vmw_balloon.c: In function 'vmballoon_mount':
> drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first use in this function); did you mean 'simple_rename'?
>    .d_dname = simple_dname,
>               ^~~~~~~~~~~~
>               simple_rename
> drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is reported only once for each function it appears in
> drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
>   return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
>          ^~~~~~~~~~~~
>          mount_bdev
> drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function with return type 'struct dentry *' makes pointer from integer without a cast [-Wint-conversion]
>   return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
>          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>         BALLOON_VMW_MAGIC);
>         ~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   83a8afa72e9c ("vmw_balloon: Compaction support")
> 
> interacting with commits
> 
>   7e5f7bb08b8c ("unexport simple_dname()")
>   8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()")
> 
> from the vfs tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Jul 2019 19:17:56 +1000
> Subject: [PATCH] convert vmwballoon to use the new mount API
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/misc/vmw_balloon.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
> index 91fa43051535..e8c0f7525f13 100644
> --- a/drivers/misc/vmw_balloon.c
> +++ b/drivers/misc/vmw_balloon.c
> @@ -29,6 +29,7 @@
>  #include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/mount.h>
> +#include <linux/pseudo_fs.h>
>  #include <linux/balloon_compaction.h>
>  #include <linux/vmw_vmci_defs.h>
>  #include <linux/vmw_vmci_api.h>
> @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b)
>  
>  #ifdef CONFIG_BALLOON_COMPACTION
>  
> -static struct dentry *vmballoon_mount(struct file_system_type *fs_type,
> -				      int flags, const char *dev_name,
> -				      void *data)
> +static int vmballoon_init_fs_context(struct fs_context *fc)
>  {
> -	static const struct dentry_operations ops = {
> -		.d_dname = simple_dname,
> -	};
> -
> -	return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> -			    BALLOON_VMW_MAGIC);
> +	return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM;
>  }
>  
>  static struct file_system_type vmballoon_fs = {
>  	.name           = "balloon-vmware",
> -	.mount          = vmballoon_mount,
> +	.init_fs_context          = vmballoon_init_fs_context,
>  	.kill_sb        = kill_anon_super,
>  };
>  

This is now a conflict between the vfs tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Fri, Jul 12, 2019 at 10:44:30AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 8 Jul 2019 19:23:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/misc/vmw_balloon.c: In function 'vmballoon_mount':
> > drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first use in this function); did you mean 'simple_rename'?
> >    .d_dname = simple_dname,
> >               ^~~~~~~~~~~~
> >               simple_rename
> > drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is reported only once for each function it appears in
> > drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
> >   return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> >          ^~~~~~~~~~~~
> >          mount_bdev
> > drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function with return type 'struct dentry *' makes pointer from integer without a cast [-Wint-conversion]
> >   return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> >          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >         BALLOON_VMW_MAGIC);
> >         ~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   83a8afa72e9c ("vmw_balloon: Compaction support")
> > 
> > interacting with commits
> > 
> >   7e5f7bb08b8c ("unexport simple_dname()")
> >   8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()")
> > 
> > from the vfs tree.
> > 
> > I applied the following merge fix patch:
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 8 Jul 2019 19:17:56 +1000
> > Subject: [PATCH] convert vmwballoon to use the new mount API
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/misc/vmw_balloon.c | 14 ++++----------
> >  1 file changed, 4 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
> > index 91fa43051535..e8c0f7525f13 100644
> > --- a/drivers/misc/vmw_balloon.c
> > +++ b/drivers/misc/vmw_balloon.c
> > @@ -29,6 +29,7 @@
> >  #include <linux/slab.h>
> >  #include <linux/spinlock.h>
> >  #include <linux/mount.h>
> > +#include <linux/pseudo_fs.h>
> >  #include <linux/balloon_compaction.h>
> >  #include <linux/vmw_vmci_defs.h>
> >  #include <linux/vmw_vmci_api.h>
> > @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b)
> >  
> >  #ifdef CONFIG_BALLOON_COMPACTION
> >  
> > -static struct dentry *vmballoon_mount(struct file_system_type *fs_type,
> > -				      int flags, const char *dev_name,
> > -				      void *data)
> > +static int vmballoon_init_fs_context(struct fs_context *fc)
> >  {
> > -	static const struct dentry_operations ops = {
> > -		.d_dname = simple_dname,
> > -	};
> > -
> > -	return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> > -			    BALLOON_VMW_MAGIC);
> > +	return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM;
> >  }
> >  
> >  static struct file_system_type vmballoon_fs = {
> >  	.name           = "balloon-vmware",
> > -	.mount          = vmballoon_mount,
> > +	.init_fs_context          = vmballoon_init_fs_context,
> >  	.kill_sb        = kill_anon_super,
> >  };
> >  
> 
> This is now a conflict between the vfs tree and Linus' tree.

Looks good to me, I'll watch out for this when Al's tree is merged.

thanks,

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

Hi all,

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

In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0:
arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function)
  struct e820entry map[E820_X_MAX];
                       ^

Caused by commit

  afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts")

interacting with commit

  66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h")

from the tip tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Apr 2017 15:12:12 +1000
Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/firmware/google/memconsole-x86-legacy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c
index 529078c62488..99df2749c4c5 100644
--- a/drivers/firmware/google/memconsole-x86-legacy.c
+++ b/drivers/firmware/google/memconsole-x86-legacy.c
@@ -20,7 +20,7 @@
 #include <linux/dmi.h>
 #include <linux/mm.h>
 #include <asm/bios_ebda.h>
-#include <asm/e820.h>
+#include <asm/e820/api.h>
 #include <linux/acpi.h>
 
 #include "memconsole.h"
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Wed, Apr 12, 2017 at 03:18:59PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0:
> arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function)
>   struct e820entry map[E820_X_MAX];
>                        ^
> 
> Caused by commit
> 
>   afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts")
> 
> interacting with commit
> 
>   66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h")
> 
> from the tip tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 12 Apr 2017 15:12:12 +1000
> Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/firmware/google/memconsole-x86-legacy.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c
> index 529078c62488..99df2749c4c5 100644
> --- a/drivers/firmware/google/memconsole-x86-legacy.c
> +++ b/drivers/firmware/google/memconsole-x86-legacy.c
> @@ -20,7 +20,7 @@
>  #include <linux/dmi.h>
>  #include <linux/mm.h>
>  #include <asm/bios_ebda.h>
> -#include <asm/e820.h>
> +#include <asm/e820/api.h>
>  #include <linux/acpi.h>
>  
>  #include "memconsole.h"
> -- 
> 2.11.0

Thanks for the patch, I'll keep it around for when things get merged to
Linus if needed.

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

Hi all,

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

drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap':
drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration]
  prot = pgprot_dmacoherent(prot);
         ^
drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int'
  prot = pgprot_dmacoherent(prot);
       ^
In file included from include/linux/miscdevice.h:6:0,
                 from drivers/misc/aspeed-lpc-ctrl.c:11:
drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=]
   dev_info(dev, "Loaded at 0x%08x (0x%08x)\n",
                 ^
include/linux/device.h:1317:51: note: in definition of macro 'dev_info'
 #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
                                                   ^
drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
   dev_info(dev, "Loaded at 0x%08x (0x%08x)\n",
                 ^
include/linux/device.h:1317:51: note: in definition of macro 'dev_info'
 #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
                                                   ^

Caused by commit

  6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver")

Clearly this will only build on arm :-(  You can only use COMPILE_TEST
if you can reasonably expect the build to work on all architectures
and platforms.

I have added the following patch for today (the warnings should be fixed as well):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Mar 2017 13:38:10 +1100
Subject: [PATCH] drivers/misc: Aspeed LPC control driver will only build on arm

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fb933b0b9297..52a46b129214 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -773,7 +773,7 @@ config PANEL_BOOT_MESSAGE
 endif # PANEL
 
 config ASPEED_LPC_CTRL
-	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
+	depends on ARCH_ASPEED && REGMAP && MFD_SYSCON
 	tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
 	---help---
 	  Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the char-misc tree

[Arnd Bergmann]

On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap':
> drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration]
>   prot = pgprot_dmacoherent(prot);

A lot of other drivers (including /dev/mem) just use pgprot_noncached() or
pgprot_writecombine(), which would make the code portable and might be
what you want here as well.

pgprot_dmacoherent() is meant specifically for mapping RAM that is used
for DMA buffers that come from dma_alloc_coherent(), which doesn't seem
to be the case here.

What kind of address range is this really?

> drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int'
>   prot = pgprot_dmacoherent(prot);
>        ^
> In file included from include/linux/miscdevice.h:6:0,
>                  from drivers/misc/aspeed-lpc-ctrl.c:11:
> drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
> drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=]
>    dev_info(dev, "Loaded at 0x%08x (0x%08x)\n",

This should just use the "%pap" for printing a phys_addr_t, otherwise we
get the same warning on ARM in some configurations.

      Arnd

Re: linux-next: build failure after merge of the char-misc tree

[Benjamin Herrenschmidt]

On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote:
> On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap':
> > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration]
> >   prot = pgprot_dmacoherent(prot);
> 
> A lot of other drivers (including /dev/mem) just use pgprot_noncached() or
> pgprot_writecombine(), which would make the code portable and might be
> what you want here as well.
> 
> pgprot_dmacoherent() is meant specifically for mapping RAM that is used
> for DMA buffers that come from dma_alloc_coherent(), which doesn't seem
> to be the case here.
> 
> What kind of address range is this really?

It's a piece of RAM that we reserve via a reserved region, which will
be accessed by HW (sort-of-DMA, ie, the "host" system will access that
using FW cycles on the LPC bus which we map to that reserved region of
memory).

Joel, Cyril, can you send a 1-liner patch to change that to
pgprot_noncached() ?

Cheers,
Ben.

> > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int'
> >   prot = pgprot_dmacoherent(prot);
> >        ^
> > In file included from include/linux/miscdevice.h:6:0,
> >                  from drivers/misc/aspeed-lpc-ctrl.c:11:
> > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
> > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=]
> >    dev_info(dev, "Loaded at 0x%08x (0x%08x)\n",
> 
> This should just use the "%pap" for printing a phys_addr_t, otherwise we
> get the same warning on ARM in some configurations.
> 
>       Arnd

Re: linux-next: build failure after merge of the char-misc tree

[Cyril Bur]

On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote:
> On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote:
> > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > Hi all,
> > > 
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap':
> > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration]
> > >   prot = pgprot_dmacoherent(prot);
> > 
> > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or
> > pgprot_writecombine(), which would make the code portable and might be
> > what you want here as well.
> > 
> > pgprot_dmacoherent() is meant specifically for mapping RAM that is used
> > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem
> > to be the case here.
> > 
> > What kind of address range is this really?
> 
> It's a piece of RAM that we reserve via a reserved region, which will
> be accessed by HW (sort-of-DMA, ie, the "host" system will access that
> using FW cycles on the LPC bus which we map to that reserved region of
> memory).
> 
> Joel, Cyril, can you send a 1-liner patch to change that to
> pgprot_noncached() ?
> 

Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig?

Also I can't help but notice this: 
https://lists.ozlabs.org/pipermail/openbmc/2017-January/006219.html
[v3 of the series]
vs
https://lists.ozlabs.org/pipermail/openbmc/2017-February/006462.html
[v4 of the series]


> Cheers,
> Ben.
> 
> > > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int'
> > >   prot = pgprot_dmacoherent(prot);
> > >        ^
> > > In file included from include/linux/miscdevice.h:6:0,
> > >                  from drivers/misc/aspeed-lpc-ctrl.c:11:
> > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
> > > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=]
> > >    dev_info(dev, "Loaded at 0x%08x (0x%08x)\n",
> > 
> > This should just use the "%pap" for printing a phys_addr_t, otherwise we
> > get the same warning on ARM in some configurations.

Thanks Arnd, I'll address that too.

> > 
> >       Arnd

Re: linux-next: build failure after merge of the char-misc tree

[Joel Stanley]

On Tue, Mar 21, 2017 at 11:06 AM, Cyril Bur <cyrilbur@gmail.com> wrote:
> On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote:
>> On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote:
>> > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > > Hi all,
>> > >
>> > > After merging the char-misc tree, today's linux-next build (x86_64
>> > > allmodconfig) failed like this:
>> > >
>> > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap':
>> > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration]
>> > >   prot = pgprot_dmacoherent(prot);
>> >
>> > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or
>> > pgprot_writecombine(), which would make the code portable and might be
>> > what you want here as well.
>> >
>> > pgprot_dmacoherent() is meant specifically for mapping RAM that is used
>> > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem
>> > to be the case here.
>> >
>> > What kind of address range is this really?
>>
>> It's a piece of RAM that we reserve via a reserved region, which will
>> be accessed by HW (sort-of-DMA, ie, the "host" system will access that
>> using FW cycles on the LPC bus which we map to that reserved region of
>> memory).
>>
>> Joel, Cyril, can you send a 1-liner patch to change that to
>> pgprot_noncached() ?
>>
>
> Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig?

Yep. With the change that Ben suggested we should be ok.

pgprot_noncached has a fall back definition in
include/asm-generic/pgtable.h, so all platforms will compile.

Cheers,

Joel

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

Hi all,

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

drivers/hv/hv.c: In function 'read_hv_clock_tsc':
drivers/hv/hv.c:154:4: error: implicit declaration of function 'rdtscll' [-Werror=implicit-function-declaration]
    rdtscll(cur_tsc);
    ^

Caused by commit

  ca9357bd26c2 ("Drivers: hv: vmbus: Implement a clocksource based on the TSC page")

interacting with commits

  87be28aaf145 ("x86/asm/tsc: Replace rdtscll() with native_read_tsc()")
  4ea1636b04db ("x86/asm/tsc: Rename native_read_tsc() to rdtsc()")

from the tip tree.

Please consider maintaining API's for a release cycle when changing them.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Aug 2015 16:21:32 +1000
Subject: [PATCH] Drivers: hv: vmbus: fix for the removal of rdtscll()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hv/hv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 6341be8739ae..335064f01c37 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -151,7 +151,7 @@ static cycle_t read_hv_clock_tsc(struct clocksource *arg)
 			u64 scale = tsc_pg->tsc_scale;
 			s64 offset = tsc_pg->tsc_offset;
 
-			rdtscll(cur_tsc);
+			cur_tsc = rdtsc();
 			/* current_tick = ((cur_tsc *scale) >> 64) + offset */
 			asm("mulq %3"
 				: "=d" (current_tick), "=a" (tmp)
-- 
2.5.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/nfc/microread/mei.c:70:2: error: implicit declaration of function '__UUID_LE' [-Werror=implicit-function-declaration]
  { MICROREAD_DRIVER_NAME, MEI_NFC_UUID},
  ^
drivers/nfc/microread/mei.c:70:2: warning: missing braces around initializer [-Wmissing-braces]
drivers/nfc/microread/mei.c:70:2: warning: (near initialization for 'microread_mei_tbl[0].uuid') [-Wmissing-braces]
drivers/nfc/microread/mei.c:70:2: error: initializer element is not constant
drivers/nfc/microread/mei.c:70:2: error: (near initialization for 'microread_mei_tbl[0].uuid[0]')
cc1: some warnings being treated as errors

Caused by commit c93b76b34b4d ("mei: bus: report also uuid in module
alias").

I have used the char-misc tree from next-20150526 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

RE: linux-next: build failure after merge of the char-misc tree

[Winkler, Tomas]

> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
Might be the case that this one was left out ?
https://lkml.org/lkml/2015/5/7/522 
uuid: extract macros for assigning raw arrays

Tomas

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Wed, May 27, 2015 at 07:08:06AM +0000, Winkler, Tomas wrote:
> 
> 
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> Might be the case that this one was left out ?
> https://lkml.org/lkml/2015/5/7/522 
> uuid: extract macros for assigning raw arrays

Odd, somehow I missed that one.  Can you please resend it, I don't see
it in my queue anywhere.

thanks,

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

In file included from drivers/misc/mei/hw-txe.c:25:0:
drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
 irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
 ^
drivers/misc/mei/hw-txe.h:64:1: error: unknown type name 'irqreturn_t'
 irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id);
 ^
drivers/misc/mei/hw-txe.c:879:1: error: unknown type name 'irqreturn_t'
 irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id)
 ^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler':
drivers/misc/mei/hw-txe.c:884:10: error: 'IRQ_WAKE_THREAD' undeclared (first use in this function)
   return IRQ_WAKE_THREAD;
          ^
drivers/misc/mei/hw-txe.c:884:10: note: each undeclared identifier is reported only once for each function it appears in
drivers/misc/mei/hw-txe.c:885:9: error: 'IRQ_NONE' undeclared (first use in this function)
  return IRQ_NONE;
         ^
drivers/misc/mei/hw-txe.c: At top level:
drivers/misc/mei/hw-txe.c:898:1: error: unknown type name 'irqreturn_t'
 irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id)
 ^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler':
drivers/misc/mei/hw-txe.c:1007:9: error: 'IRQ_HANDLED' undeclared (first use in this function)
  return IRQ_HANDLED;
         ^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler':
drivers/misc/mei/hw-txe.c:886:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler':
drivers/misc/mei/hw-txe.c:1008:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^

Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
Migration support") from the pci tree which removed the include of
irqreturn.h from pci.h ...

See Rule 1 from Documentation/SubmitChecklist ...

I added the following merge fix patch (this should be applied to the
char-misc tree):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Feb 2014 16:38:28 +1100
Subject: [PATCH] mei: txe: include irqreturn.h for irqreturn_t etc

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/mei/hw-txe.c | 1 +
 drivers/misc/mei/hw-txe.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index 19579e560dad..49a5ed376969 100644
--- a/drivers/misc/mei/hw-txe.c
+++ b/drivers/misc/mei/hw-txe.c
@@ -18,6 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/irqreturn.h>
 
 #include <linux/mei.h>
 
diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h
index 857d88ccef61..fdb665f44d5d 100644
--- a/drivers/misc/mei/hw-txe.h
+++ b/drivers/misc/mei/hw-txe.h
@@ -17,6 +17,8 @@
 #ifndef _MEI_HW_TXE_H_
 #define _MEI_HW_TXE_H_
 
+#include <linux/irqreturn.h>
+
 #include "hw.h"
 #include "hw-txe-regs.h"
 
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi Greg,

On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/misc/mei/hw-txe.c:25:0:
> drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
>  irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
>  ^
> 
> Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
> probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
> Migration support") from the pci tree which removed the include of
> irqreturn.h from pci.h ...
> 
> See Rule 1 from Documentation/SubmitChecklist ...
> 
> I added the following merge fix patch (this should be applied to the
> char-misc tree):

Ping?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > In file included from drivers/misc/mei/hw-txe.c:25:0:
> > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
> >  irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
> >  ^
> > 
> > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
> > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
> > Migration support") from the pci tree which removed the include of
> > irqreturn.h from pci.h ...
> > 
> > See Rule 1 from Documentation/SubmitChecklist ...
> > 
> > I added the following merge fix patch (this should be applied to the
> > char-misc tree):
> 
> Ping?

I've merged everything together, and it all builds properly for me in
the char-misc branches, so I don't see what is missing.  What did I do
wrong?

confused,

greg k-h

Re: linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi Greg,

On Wed, 26 Feb 2014 19:37:16 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote:
> > 
> > On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > In file included from drivers/misc/mei/hw-txe.c:25:0:
> > > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
> > >  irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
> > >  ^
> > > 
> > > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
> > > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
> > > Migration support") from the pci tree which removed the include of
> > > irqreturn.h from pci.h ...
> > > 
> > > See Rule 1 from Documentation/SubmitChecklist ...
> > > 
> > > I added the following merge fix patch (this should be applied to the
> > > char-misc tree):
> > 
> > Ping?
> 
> I've merged everything together, and it all builds properly for me in
> the char-misc branches, so I don't see what is missing.  What did I do
> wrong?

Nothing, your tree is fine, except when merged with the pci tree.  There
is a commit in the pci tree that removed the include of irqreturn.h from
pci.h, thus exposing that drivers/misc/mei/hw-txe.c did not include
irqreturn.h directly despite using stuff from there (similarly for
hw-txe.h).  My patch is just a "quality of implementation" thing in your
tree at the moment, but applying it to your tree will save doing the
semantic merge conflict fixup in linux-next and later in Linus' tree when
your tree and the pci tree meet there.

i.e. it does not hurt your tree to apply it and will save is forgetting
later.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/misc/mic/host/mic_main.c: In function 'mic_probe':
drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent'
   NULL, "state");
   ^
In file included from include/linux/kobject.h:21:0,
                 from include/linux/module.h:16,
                 from drivers/misc/mic/host/mic_main.c:26:
include/linux/sysfs.h:465:1: note: declared here
 sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name)
 ^

Caused by commit 3a6a9201897c ("Intel MIC Host Driver, card OS state
management") interacting with commit 388975cccaaf ("sysfs: clean up
sysfs_get_dirent()") from the driver-core tree.

I added this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Sep 2013 17:07:12 +1000
Subject: [PATCH] Intel MIC Host Driver: fix for sysfs_get_dirent API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/mic/host/mic_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c
index a8965d4..28c8490 100644
--- a/drivers/misc/mic/host/mic_main.c
+++ b/drivers/misc/mic/host/mic_main.c
@@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev,
 			"device_create_with_groups failed rc %d\n", rc);
 		goto smpt_uninit;
 	}
-	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd,
-		NULL, "state");
+	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state");
 	if (!mdev->state_sysfs) {
 		rc = -ENODEV;
 		dev_err(&pdev->dev, "sysfs_get_dirent failed rc %d\n", rc);
-- 
1.8.4.rc3


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the char-misc tree

[Greg KH]

On Fri, Sep 27, 2013 at 05:10:29PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/misc/mic/host/mic_main.c: In function 'mic_probe':
> drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent'
>    NULL, "state");
>    ^
> In file included from include/linux/kobject.h:21:0,
>                  from include/linux/module.h:16,
>                  from drivers/misc/mic/host/mic_main.c:26:
> include/linux/sysfs.h:465:1: note: declared here
>  sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name)
>  ^
> 
> Caused by commit 3a6a9201897c ("Intel MIC Host Driver, card OS state
> management") interacting with commit 388975cccaaf ("sysfs: clean up
> sysfs_get_dirent()") from the driver-core tree.
> 
> I added this merge fix patch:

That looks correct, thanks, I'll carry this along to handle the merge
issue when it all goes to Linus.

greg k-h

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating " character [enabled by default]
drivers/misc/cs5535-mfgpt.c:31:31: warning: missing terminating " character [enabled by default]
drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list invoking macro "MODULE_PARM_DESC"
drivers/misc/cs5535-mfgpt.c:27:1: error: expected '=', ',', ';', 'asm' or '__attribute__' at end of input

Caused by commit 945480b159aa ("cs5535-mfgpt: Add another reset method").

I have used the char-misc tree from next-20130328 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au


[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the char-misc tree

[Richard Weinberger]

Am Tue, 2 Apr 2013 17:29:50 +1100
schrieb Stephen Rothwell <sfr@canb.auug.org.au>:

> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating "
> character [enabled by default] drivers/misc/cs5535-mfgpt.c:31:31:
> warning: missing terminating " character [enabled by default]
> drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list
> invoking macro "MODULE_PARM_DESC" drivers/misc/cs5535-mfgpt.c:27:1:
> error: expected '=', ',', ';', 'asm' or '__attribute__' at end of
> input
> 
> Caused by commit 945480b159aa ("cs5535-mfgpt: Add another reset
> method").
> 
> I have used the char-misc tree from next-20130328 for today.

New patch sent.
A terminating quote was missing.
Looks like I fat fingered it while editing the patch file by hand...

Sorry for that,
//richard

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the char-misc tree, today's linux-next build
(x86_64_allmodconfig) failed like this:

drivers/input/keyboard/pmic8xxx-keypad.c:24:35: fatal error: linux/mfd/pm8xxx/gpio.h: No such file or directory

Caused by commit e44b0ceee4cc ("add single-wire serial bus interface
(SSBI) driver") which added the Kconfig symbol MSM_SSBI (later changed to
just SSBI) which did not exist in the tree before.  However,
MFD_PM8921_CORE depended on it and that selects MFD_PM8XXX which allows
the above file to build (and fail).

I have used the char-misc tree from next-20130325 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
drivers/net/can/softing/softing_cs.c: In function '__inittest':
drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function)
drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/can/softing/softing_cs.c: At top level:
drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
drivers/net/can/softing/softing_cs.c: In function '__exittest':
drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function)
drivers/net/can/softing/softing_cs.c: At top level:
drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable]
drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol '&softingcs_driver_init'
drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol '&softingcs_driver_exit'

Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver").

I have used the char-misc tree form next-20130315 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the char-misc tree

[Kurt Van Dijck]

On Mon, Mar 18, 2013 at 01:56:14PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
> drivers/net/can/softing/softing_cs.c: In function '__inittest':
> drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function)
> drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/can/softing/softing_cs.c: At top level:
> drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
> drivers/net/can/softing/softing_cs.c: In function '__exittest':
> drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function)
> drivers/net/can/softing/softing_cs.c: At top level:
> drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable]
> drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol '&softingcs_driver_init'
> drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol '&softingcs_driver_exit'
> 
> Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver").
> 
> I have used the char-misc tree form next-20130315 for today.

I have no idea what I've overlooked during tests.  My apologies.
I have found the problem. Can this be squashed?
Kurt

-- 
commit 081ec8f7f7ef4d68c7a6ffe4a571b1a855527627
Author: Kurt Van Dijck <kurt.van.dijck@eia.be>
Date:   Mon Mar 18 09:56:55 2013

    FIX: softingcs conversion to module_pcmcia_driver macro
    
    Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>

diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index 738355c..498605f 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -340,7 +340,7 @@ static struct pcmcia_driver softingcs_driver = {
 	.remove		= softingcs_remove,
 };
 
-module_pcmcia_driver(&softingcs_driver);
+module_pcmcia_driver(softingcs_driver);
 
 MODULE_DESCRIPTION("softing CANcard driver"
 		", links PCMCIA card to softing driver");