linux-next: manual merge of the net-next tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/devlink/leftover.c

between commit:

  b20b8aec6ffc ("devlink: Fix netdev notifier chain corruption")

from Linus' tree and commits:

  dbeeca81bd93 ("devlink: Split out dev get and dump code")
  7d7e9169a3ec ("devlink: move devlink reload notifications back in between _down() and _up() calls")
  a131315a47bb ("devlink: send objects notifications during devlink reload")

from the net-next tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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@xxxxxxxxxxxxxxxx>
Date: Fri, 17 Feb 2023 10:37:43 +1100
Subject: [PATCH] fix for "devlink: Fix netdev notifier chain corruption"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 net/devlink/dev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index b40153fa2680..bf1d6f1bcfc7 100644
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -343,8 +343,6 @@ static void devlink_reload_netns_change(struct devlink *devlink,
 	 * reload process so the notifications are generated separatelly.
 	 */
 	devlink_notify_unregister(devlink);
-	move_netdevice_notifier_net(curr_net, dest_net,
-				    &devlink->netdevice_nb);
 	write_pnet(&devlink->_net, dest_net);
 	devlink_notify_register(devlink);
 }
-- 
2.39.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpY70iRQe0s1.pgp
Description: OpenPGP digital signature