linux-next: build failure after merge of the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr at 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 at 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 at 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