2020-05-08 00:49:12

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the nfsd tree

Hi all,

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

kernel/trace/trace_hwlat.c:329:12: error: conflicting types for 'kthread_fn'
329 | static int kthread_fn(void *data)
| ^~~~~~~~~~
In file included from kernel/trace/trace_hwlat.c:40:
include/linux/kthread.h:60:7: note: previous declaration of 'kthread_fn' was here
60 | void *kthread_fn(struct task_struct *k);
| ^~~~~~~~~~

Caused by commit

7df082e85764 ("kthread: save thread function")

I have used the nfsd tree from next-20200507 for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2020-05-12 00:24:46

by J. Bruce Fields

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the nfsd tree

On Fri, May 08, 2020 at 10:47:20AM +1000, Stephen Rothwell wrote:
> After merging the nfsd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> kernel/trace/trace_hwlat.c:329:12: error: conflicting types for 'kthread_fn'
> 329 | static int kthread_fn(void *data)
> | ^~~~~~~~~~
> In file included from kernel/trace/trace_hwlat.c:40:
> include/linux/kthread.h:60:7: note: previous declaration of 'kthread_fn' was here
> 60 | void *kthread_fn(struct task_struct *k);
> | ^~~~~~~~~~
>
> Caused by commit
>
> 7df082e85764 ("kthread: save thread function")
>
> I have used the nfsd tree from next-20200507 for today.

Whoops, I forgot to say thanks for this report. I renamed the
kthread_fn in my patches to kthread_func.

--b.