On Mon, 28 Aug 2023 18:24:20 +0300 Ido Schimmel wrote:

Jakub / Paolo, this change conflicts with changes in net-next and I
assume that the next PR that you are going to send is from net-next.
What is your preference in this case? Wait for the PR to be accepted and
for master to be merged into net?

The trees will be merged before the PR, in the next 24h.
As soon as they are you can resend for net-next.