| Message ID | 20230208094657.379f2b1a@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
Hi Stephen, On 07/02/2023 23:46, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/devlink/leftover.c (net/core/devlink.c in the net tree) > > between commit: > > 565b4824c39f ("devlink: change port event netdev notifier from per-net to global") > > from the net tree and commits: > > f05bd8ebeb69 ("devlink: move code to a dedicated directory") > 687125b5799c ("devlink: split out core code") > > from the net-next tree. > > I fixed it up (I used the latter version of this file and applied the > following merge fix up) and can carry the fix as necessary. Thank you for the fix! I also had the same conflicts on MPTCP side when merging mptcp-next with -net and I used the same resolution: Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net> I was just a bit confused because I didn't see the modifications in net/devlink/leftover.c -- devlink_port_netdevice_event() function -- in the patch you attached but I saw them on linux-next. I guess that's because you used the latter version of this file. Just in case it would help the net maintainers, I attached to this email the modification I had on my side which looks the same as Jiri's original patch but using the new paths. Cheers, Matt
diff --git a/net/devlink/core.c b/net/devlink/core.c index aeffd1b8206d..a4f47dafb864 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -205,7 +205,7 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops, goto err_xa_alloc; devlink->netdevice_nb.notifier_call = devlink_port_netdevice_event; - ret = register_netdevice_notifier_net(net, &devlink->netdevice_nb); + ret = register_netdevice_notifier(&devlink->netdevice_nb); if (ret) goto err_register_netdevice_notifier; @@ -266,8 +266,7 @@ void devlink_free(struct devlink *devlink) xa_destroy(&devlink->snapshot_ids); xa_destroy(&devlink->ports); - WARN_ON_ONCE(unregister_netdevice_notifier_net(devlink_net(devlink), - &devlink->netdevice_nb)); + WARN_ON_ONCE(unregister_netdevice_notifier(&devlink->netdevice_nb)); xa_erase(&devlinks, devlink->index);
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/devlink/leftover.c (net/core/devlink.c in the net tree) between commit: 565b4824c39f ("devlink: change port event netdev notifier from per-net to global") from the net tree and commits: f05bd8ebeb69 ("devlink: move code to a dedicated directory") 687125b5799c ("devlink: split out core code") from the net-next tree. I fixed it up (I used the latter version of this file and applied the following merge fix up) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 8 Feb 2023 09:43:53 +1100 Subject: [PATCH] fxup for "devlink: split out core code" interacting with "devlink: change port event netdev notifier from per-net to global" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- net/devlink/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)