* linux-next: build failure after merge of the powerpc-fixes tree
@ 2021-03-02 0:21 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2021-03-02 0:21 UTC (permalink / raw)
To: Michael Ellerman, PowerPC
Cc: Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]
Hi all,
After merging the powerpc-fixes tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
5399 | static void ibmvnic_remove(struct vio_dev *dev)
| ^~~~~~~~~~~~~~
drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
81 | static int ibmvnic_remove(struct vio_dev *);
| ^~~~~~~~~~~~~~
Caused by commit
1bdd1e6f9320 ("vio: make remove callback return void")
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Mar 2021 11:06:37 +1100
Subject: [PATCH] vio: fix for make remove callback return void
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/ibm/ibmvnic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index eb39318766f6..fe3201ba2034 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -78,7 +78,6 @@ MODULE_LICENSE("GPL");
MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
-static int ibmvnic_remove(struct vio_dev *);
static void release_sub_crqs(struct ibmvnic_adapter *, bool);
static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
--
2.30.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* linux-next: build failure after merge of the powerpc-fixes tree
@ 2021-03-02 0:21 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2021-03-02 0:21 UTC (permalink / raw)
To: Michael Ellerman, PowerPC
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]
Hi all,
After merging the powerpc-fixes tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
5399 | static void ibmvnic_remove(struct vio_dev *dev)
| ^~~~~~~~~~~~~~
drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
81 | static int ibmvnic_remove(struct vio_dev *);
| ^~~~~~~~~~~~~~
Caused by commit
1bdd1e6f9320 ("vio: make remove callback return void")
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Mar 2021 11:06:37 +1100
Subject: [PATCH] vio: fix for make remove callback return void
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/ibm/ibmvnic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index eb39318766f6..fe3201ba2034 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -78,7 +78,6 @@ MODULE_LICENSE("GPL");
MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
-static int ibmvnic_remove(struct vio_dev *);
static void release_sub_crqs(struct ibmvnic_adapter *, bool);
static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
--
2.30.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
2021-03-02 0:21 ` Stephen Rothwell
@ 2021-03-02 2:09 ` Michael Ellerman
-1 siblings, 0 replies; 8+ messages in thread
From: Michael Ellerman @ 2021-03-02 2:09 UTC (permalink / raw)
To: Stephen Rothwell, PowerPC
Cc: Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> After merging the powerpc-fixes tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
> | ^~~~~~~~~~~~~~
> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
> 81 | static int ibmvnic_remove(struct vio_dev *);
> | ^~~~~~~~~~~~~~
>
> Caused by commit
>
> 1bdd1e6f9320 ("vio: make remove callback return void")
Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
> I have applied the following patch for today:
Thanks, I'll squash it in.
cheers
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Mar 2021 11:06:37 +1100
> Subject: [PATCH] vio: fix for make remove callback return void
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/ethernet/ibm/ibmvnic.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index eb39318766f6..fe3201ba2034 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -78,7 +78,6 @@ MODULE_LICENSE("GPL");
> MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
>
> static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
> -static int ibmvnic_remove(struct vio_dev *);
> static void release_sub_crqs(struct ibmvnic_adapter *, bool);
> static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
> static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
> --
> 2.30.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
@ 2021-03-02 2:09 ` Michael Ellerman
0 siblings, 0 replies; 8+ messages in thread
From: Michael Ellerman @ 2021-03-02 2:09 UTC (permalink / raw)
To: Stephen Rothwell, PowerPC
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Uwe Kleine-König
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> After merging the powerpc-fixes tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
> | ^~~~~~~~~~~~~~
> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
> 81 | static int ibmvnic_remove(struct vio_dev *);
> | ^~~~~~~~~~~~~~
>
> Caused by commit
>
> 1bdd1e6f9320 ("vio: make remove callback return void")
Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
> I have applied the following patch for today:
Thanks, I'll squash it in.
cheers
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Mar 2021 11:06:37 +1100
> Subject: [PATCH] vio: fix for make remove callback return void
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/ethernet/ibm/ibmvnic.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index eb39318766f6..fe3201ba2034 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -78,7 +78,6 @@ MODULE_LICENSE("GPL");
> MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
>
> static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
> -static int ibmvnic_remove(struct vio_dev *);
> static void release_sub_crqs(struct ibmvnic_adapter *, bool);
> static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
> static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
> --
> 2.30.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
2021-03-02 2:09 ` Michael Ellerman
@ 2021-03-02 8:30 ` Uwe Kleine-König
-1 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2021-03-02 8:30 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, PowerPC
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1134 bytes --]
Hello,
On 3/2/21 3:09 AM, Michael Ellerman wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> Hi all,
>>
>> After merging the powerpc-fixes tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
>> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
>> | ^~~~~~~~~~~~~~
>> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
>> 81 | static int ibmvnic_remove(struct vio_dev *);
>> | ^~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>> 1bdd1e6f9320 ("vio: make remove callback return void")
>
> Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
Would you accept a patch to add the driver to one of the defconfigs as
an excuse for the build breakage I created? Which would be appropriate?
ppc64_defconfig?
>> I have applied the following patch for today:
>
> Thanks, I'll squash it in.
Also thanks for catching to Stephen and to Michael for the fixup.
Best regards
Uwe
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
@ 2021-03-02 8:30 ` Uwe Kleine-König
0 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2021-03-02 8:30 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, PowerPC
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1134 bytes --]
Hello,
On 3/2/21 3:09 AM, Michael Ellerman wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> Hi all,
>>
>> After merging the powerpc-fixes tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
>> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
>> | ^~~~~~~~~~~~~~
>> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
>> 81 | static int ibmvnic_remove(struct vio_dev *);
>> | ^~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>> 1bdd1e6f9320 ("vio: make remove callback return void")
>
> Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
Would you accept a patch to add the driver to one of the defconfigs as
an excuse for the build breakage I created? Which would be appropriate?
ppc64_defconfig?
>> I have applied the following patch for today:
>
> Thanks, I'll squash it in.
Also thanks for catching to Stephen and to Michael for the fixup.
Best regards
Uwe
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
2021-03-02 8:30 ` Uwe Kleine-König
@ 2021-03-02 22:49 ` Michael Ellerman
-1 siblings, 0 replies; 8+ messages in thread
From: Michael Ellerman @ 2021-03-02 22:49 UTC (permalink / raw)
To: Uwe Kleine-König, Stephen Rothwell, PowerPC
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Uwe Kleine-König <uwe@kleine-koenig.org> writes:
> Hello,
>
> On 3/2/21 3:09 AM, Michael Ellerman wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>> Hi all,
>>>
>>> After merging the powerpc-fixes tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
>>> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
>>> | ^~~~~~~~~~~~~~
>>> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
>>> 81 | static int ibmvnic_remove(struct vio_dev *);
>>> | ^~~~~~~~~~~~~~
>>>
>>> Caused by commit
>>>
>>> 1bdd1e6f9320 ("vio: make remove callback return void")
>>
>> Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
>
> Would you accept a patch to add the driver to one of the defconfigs as
> an excuse for the build breakage I created?
Thanks, but I already sent a patch adding it.
We should really have these drivers enabled in our defconfig, so that's
on us.
cheers
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-fixes tree
@ 2021-03-02 22:49 ` Michael Ellerman
0 siblings, 0 replies; 8+ messages in thread
From: Michael Ellerman @ 2021-03-02 22:49 UTC (permalink / raw)
To: Uwe Kleine-König, Stephen Rothwell, PowerPC
Cc: Linux Next Mailing List, Linux Kernel Mailing List
Uwe Kleine-König <uwe@kleine-koenig.org> writes:
> Hello,
>
> On 3/2/21 3:09 AM, Michael Ellerman wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>> Hi all,
>>>
>>> After merging the powerpc-fixes tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/net/ethernet/ibm/ibmvnic.c:5399:13: error: conflicting types for 'ibmvnic_remove'
>>> 5399 | static void ibmvnic_remove(struct vio_dev *dev)
>>> | ^~~~~~~~~~~~~~
>>> drivers/net/ethernet/ibm/ibmvnic.c:81:12: note: previous declaration of 'ibmvnic_remove' was here
>>> 81 | static int ibmvnic_remove(struct vio_dev *);
>>> | ^~~~~~~~~~~~~~
>>>
>>> Caused by commit
>>>
>>> 1bdd1e6f9320 ("vio: make remove callback return void")
>>
>> Gah, is IBMVNIC in any of our defconfigs?! ... no it's not.
>
> Would you accept a patch to add the driver to one of the defconfigs as
> an excuse for the build breakage I created?
Thanks, but I already sent a patch adding it.
We should really have these drivers enabled in our defconfig, so that's
on us.
cheers
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-02 23:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 0:21 linux-next: build failure after merge of the powerpc-fixes tree Stephen Rothwell
2021-03-02 0:21 ` Stephen Rothwell
2021-03-02 2:09 ` Michael Ellerman
2021-03-02 2:09 ` Michael Ellerman
2021-03-02 8:30 ` Uwe Kleine-König
2021-03-02 8:30 ` Uwe Kleine-König
2021-03-02 22:49 ` Michael Ellerman
2021-03-02 22:49 ` Michael Ellerman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.