Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Fri, 20 May 2022 15:16:37 -0700
From:   Saeed Mahameed <saeedm@nvidia.com>
To:     Jakub Kicinski <kuba@kernel.org>
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: <20220520221637.24jwi3uy5iai3pxo@sx1>
References: <20220519113529.226bc3e2@canb.auug.org.au>
 <20220519040345.6yrjromcdistu7vh@sx1>
 <20220519104852.0b6afa26@kernel.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20220519104852.0b6afa26@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3N5lZHvkXkgY+ApfdoTj+rlFU1RgeIz5X2JflhFlqsFRj3zcDlgdHLexAaKV?=
 =?us-ascii?Q?EVgWpELzzR8oLFEvPjoljRdzk0YeVw+hvKBU2ehYJs9p8oa+fWVbKXtO93Gx?=
 =?us-ascii?Q?gy2us0K9DWCH1uAHDED04BxGOPqAYsdCe06ewb8qulGAJXYNv2BDInx+hQYN?=
 =?us-ascii?Q?LkoUzxSMkOkjCkO/IsBTS+tLQSCN3N4Nt8k2nSrLGdOe/Ug0Def72asGiZPy?=
 =?us-ascii?Q?VuUtPRDx+QkKm+f/ao6hp90Kofgr4knlhceaw2OO0dPqSHgeaQhn4v/e/HK/?=
 =?us-ascii?Q?0Vlg8jahBO9vk+/wQh+S5Kl49EVDBtwQ8lLODKRuQhZRcFpaOdrPd+6IvwO5?=
 =?us-ascii?Q?a9e3FKUWF5Pr8QDYWzJDEzO9qQEhIu7hUpbfXnTCmWkKiK4EPxabQLve1/C+?=
 =?us-ascii?Q?Xv/qymX6+I6mHC2lI/OSB4IdW72UdE9WV6IpRRD4FAm7taVdk+8vtPdkVWPA?=
 =?us-ascii?Q?gnzUNbHQnGpIuLwukKY1gnnMPRfRC3KH1c7KDKBI4a0v66voveDnnCelEOkL?=
 =?us-ascii?Q?OR6G/8VZe30ic3TPFDbCaR+oIbShI4Dquooe+HiZyW9J24qU93aUo0hBa794?=
 =?us-ascii?Q?vP4p97ifQ2ZWll7pqrWS3qj2LOKJXiphDHbalTRIUiZEjlW7268GGDF4REfB?=
 =?us-ascii?Q?L0QqbAW/hhNPx8vJWSEigElYMsW6Ih5x5rbqvMLPreYwXPELGuHRZocK6GZj?=
 =?us-ascii?Q?rCxqdbh4XXw4j+ngneZfs94qFwtvbtWGYjLsjvPdSG9sSHu7Pq+7FCDEexTk?=
 =?us-ascii?Q?idmv264zWvjeQabky1U3mI24nwItW7uGVfWfzy5D8xOmkQQF67v5HmpyRlOM?=
 =?us-ascii?Q?7WuvEBmj1gJfVWcgW0kPADcGke+nDYazXZ5nht8vbiZ6eNuJp4vzvm8MZFvU?=
 =?us-ascii?Q?n8AM5yJL71rCtFKXNTs1xTRIsi9EnHOCyic2YUOY+C/kmxIZcL1p1vBQdFQO?=
 =?us-ascii?Q?uL/Shto99Enkxd5r5VaDVIGrVXLYaxt/wSWoiZ8jDKVkKgXFTzpRSazBHiem?=
 =?us-ascii?Q?UFVZaBW4Z5gnutIJwPlI9qewUD2kVbjx/lKIfOaO1zGGJdx8Gu2WHOkZkrAB?=
 =?us-ascii?Q?okVjHVuPPlXKzBh77QVCDhNE9TbRpFpyhq8j/NeUNEtlv1avVT0dXHbWqTT4?=
 =?us-ascii?Q?SZthVnAxjW+ko2YRL7OksEmKa/+Wk9983Sh5Y0+V5s6wWMv6GIjlkjU7nNOl?=
 =?us-ascii?Q?K2MjQN6Mtd3VhprzBy5LfAiIqh1lw7MtwnwNkXgUOdG/PaZBsoKROA8QoRSg?=
 =?us-ascii?Q?J4HsISNOIW78P09v72V1DlZaauiUNx0WAyTt0flo6YpjW/g4dI50rQzmCnJF?=
 =?us-ascii?Q?Smmw+6skFJ1B11CfQt34XU1J0uuprYAyuq8UzuHZeAfwYxRPO5Q23rAWpMEw?=
 =?us-ascii?Q?3HCpmGdnyt37ePn/drKnKg+9h//fVVYq1Jxg/jJ27OoncicB9o3rI+gC0FtY?=
 =?us-ascii?Q?CjB8cdHlVE74F74vLL/Hbz0gkHLERETyeY5W1fpBzTPqxq5cVWh9MkBgEgi/?=
 =?us-ascii?Q?B7Z9W2twe9wLvV2v7XenZCNldpEdwXxCfTR6gO6Uynw9xykzAk1bb92MTkS1?=
 =?us-ascii?Q?iC/4R25oaGbMdecFJrAiNZlF29AjtFiI6CwSSyM5FGzHYCPyPYhlp/hsfm/y?=
 =?us-ascii?Q?18JiE6N2whRMU6mIinMERVji8wUYDOyaVoZGhlfrucd13UKyZYUzG1bcRmXQ?=
 =?us-ascii?Q?xyM7VNMLu+x9ynZR6l9ZBPx42rzPd73cNOMgOpcdrJ8RHKRipXeuV7c23JHZ?=
 =?us-ascii?Q?04TlIreNncWNhaamEh5L26SIF111ULKzzGqTBlL81ZiU/zpBSlCJ?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e679d8e6-d826-4fc1-eb8b-08da3aae68a3
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4209.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2022 22:16:38.2671
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2SWKgqX2C+QvgC1hQYnxxmqb97I6Hme0QWz4gg0FLEoWGedOwRBvlVONe0sygVv/lr4gXi+Xdq+YNMV8jhREjQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6071
X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 19 May 10:48, Jakub Kicinski wrote:
>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 :/

Yes, sorry again, will be more careful in the future.