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
Date: Thu, 19 May 2022 10:48:52 -0700 [thread overview]
Message-ID: <20220519104852.0b6afa26@kernel.org> (raw)
In-Reply-To: <20220519040345.6yrjromcdistu7vh@sx1>
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 :/
next prev parent reply other threads:[~2022-05-19 17:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 1:35 linux-next: manual merge of the rdma tree with the net tree Stephen Rothwell
2022-05-19 4:03 ` Saeed Mahameed
2022-05-19 17:48 ` Jakub Kicinski [this message]
2022-05-20 22:16 ` Saeed Mahameed
-- strict thread matches above, loose matches on Subject: below --
2018-12-17 0:08 Stephen Rothwell
2018-12-17 21:24 ` Saeed Mahameed
2018-01-15 0:53 Stephen Rothwell
2018-01-15 12:24 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220519104852.0b6afa26@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leon@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=sfr@canb.auug.org.au \
--cc=shayd@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.