On Sat, 5 Dec 2020 15:35:45 -0800 Jakub Kicinski wrote:
> On Fri, 4 Dec 2020 10:29:52 -0800 Saeed Mahameed wrote:
> > This pull request is targeting net-next and rdma-next branches.
> >
> > This series provides mlx5 support for auxiliary bus devices.
> >
> > It starts with a merge commit of tag 'auxbus-5.11-rc1' from
> > gregkh/driver-core into mlx5-next, then the mlx5 patches that will convert
> > mlx5 ulp devices (netdev, rdma, vdpa) to use the proper auxbus
> > infrastructure instead of the internal mlx5 device and interface management
> > implementation, which Leon is deleting at the end of this patchset.
> >
> > Link:
> > https://lore.kernel.org/alsa-devel/[email protected]/
> >
> > Thanks to everyone for the joint effort !
>
> Pulled, thanks! (I'll push out after build finishes so may be an hour)
Or not, looks like you didn't adjust to Greg's changes:
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:5505:12: error:
initialization of ‘void (*)(struct auxiliary_device *)’ from incompatible
pointer type ‘int (*)(struct auxiliary_device *)’
[-Werror=incompatible-pointer-types]
5505 | .remove = mlx5e_remove,
| ^~~~~~~~~~~~
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:5505:12: note: (near
initialization for ‘mlx5e_driver.remove’)
cc1: some warnings being treated as errors
make[6]: *** [../scripts/Makefile.build:283:
drivers/net/ethernet/mellanox/mlx5/core/en_main.o] Error 1
make[5]: *** [../scripts/Makefile.build:500:
drivers/net/ethernet/mellanox/mlx5/core] Error 2
make[4]: *** [../scripts/Makefile.build:500: drivers/net/ethernet/mellanox]
Error 2
make[3]: *** [../scripts/Makefile.build:500: drivers/net/ethernet] Error 2
make[3]: *** Waiting for unfinished jobs....
