Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 19 May 2022 10:48:52 -0700
From:   Jakub Kicinski <kuba@kernel.org>
To:     Saeed Mahameed <saeedm@nvidia.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Leon Romanovsky <leon@kernel.org>,
        Leon Romanovsky <leonro@nvidia.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shay Drory <shayd@nvidia.com>
Subject: Re: linux-next: manual merge of the rdma tree with the net tree
Message-ID: <20220519104852.0b6afa26@kernel.org>
In-Reply-To: <20220519040345.6yrjromcdistu7vh@sx1>
References: <20220519113529.226bc3e2@canb.auug.org.au>
        <20220519040345.6yrjromcdistu7vh@sx1>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

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 :/