Subject: Re: linux-next: manual merge of the rdma tree with the net tree

From: Jakub Kicinski <[email-masked]>
Date: Thu, 19 May 2022 10:48:52 -0700

On Wed, 18 May 2022 21:03:45 -0700 Saeed Mahameed wrote:
> >@@@ -1274,9 -1252,7 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
> >  	mlx5_ec_cleanup(dev);
> >  	mlx5_sf_hw_table_destroy(dev);
> >  	mlx5_vhca_event_stop(dev);
> > -	mlx5_cleanup_fs(dev);
> > +	mlx5_fs_core_cleanup(dev);
> >- 	mlx5_accel_ipsec_cleanup(dev);
> >- 	mlx5_accel_tls_cleanup(dev);
> >  	mlx5_fpga_device_stop(dev);
> >  	mlx5_rsc_dump_cleanup(dev);
> >  	mlx5_hv_vhca_cleanup(dev->hv_vhca);  
> 
> I already mentioned this to the netdev maintainers, same conflict should
> appear in net-next, this is the correct resolution, Thanks Stephen.

FTR could you not have held off the mlx5_$verb_fs() -> mlx5_fs_$verb
rename until net-next? This conflict looks avoidable :/