drop queue-6.1/net-devlink-move-netdev-notifier-block-to-dest-namespace-during-reload...

diff --git a/queue-6.1/net-devlink-move-netdev-notifier-block-to-dest-namespace-during-reload.patch b/queue-6.1/net-devlink-move-netdev-notifier-block-to-dest-namespace-during-reload.patch
deleted file mode 100644 (file)
index 76bbb7c..0000000
--- a/queue-6.1/net-devlink-move-netdev-notifier-block-to-dest-namespace-during-reload.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 15feb56e30efea95992f5c572cee753db205eb7b Mon Sep 17 00:00:00 2001
-From: Jiri Pirko <jiri@nvidia.com>
-Date: Tue, 8 Nov 2022 14:22:07 +0100
-Subject: net: devlink: move netdev notifier block to dest namespace during reload
-
-From: Jiri Pirko <jiri@nvidia.com>
-
-commit 15feb56e30efea95992f5c572cee753db205eb7b upstream.
-
-The notifier block tracking netdev changes in devlink is registered
-during devlink_alloc() per-net, it is then unregistered
-in devlink_free(). When devlink moves from net namespace to another one,
-the notifier block needs to move along.
-
-Fix this by adding forgotten call to move the block.
-
-Reported-by: Ido Schimmel <idosch@idosch.org>
-Fixes: 02a68a47eade ("net: devlink: track netdev with devlink_port assigned")
-Reviewed-by: Ido Schimmel <idosch@nvidia.com>
-Tested-by: Ido Schimmel <idosch@nvidia.com>
-Signed-off-by: Jiri Pirko <jiri@nvidia.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/devlink/leftover.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/net/devlink/leftover.c
-+++ b/net/devlink/leftover.c
-@@ -4507,8 +4507,11 @@ static int devlink_reload(struct devlink
-       if (err)
-               return err;
- 
--      if (dest_net && !net_eq(dest_net, curr_net))
-+      if (dest_net && !net_eq(dest_net, curr_net)) {
-+              move_netdevice_notifier_net(curr_net, dest_net,
-+                                          &devlink->netdevice_nb);
-               write_pnet(&devlink->_net, dest_net);
-+      }
- 
-       err = devlink->ops->reload_up(devlink, action, limit, actions_performed, extack);
-       devlink_reload_failed_set(devlink, !!err);

diff --git a/queue-6.1/series b/queue-6.1/series
index 5eee482e9a548d5940e9550fb0f2bf50f1205acd..3a3a7fae345ddf532e69907e18459a1bb34975f0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -197,7 +197,6 @@ asoc-pxa-fix-a-memory-leak-in-probe.patch
 drm-bridge-ti-sn65dsi86-associate-dsi-device-lifetim.patch
 drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch
 net-make-sure-we-never-create-ifindex-0.patch
-net-devlink-move-netdev-notifier-block-to-dest-namespace-during-reload.patch
 serial-8250-omap-move-uart_write-inside-pm-section.patch
 serial-8250-omap-convert-to-modern-pm-ops.patch
 kallsyms-reduce-the-memory-occupied-by-kallsyms_seqs.patch