drop nvpp2-debugfs patch

diff --git a/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch b/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
deleted file mode 100644 (file)
index 0d79d7f..0000000
--- a/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fe2c9c61f668cde28dac2b188028c5299cedcc1e Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-commit fe2c9c61f668cde28dac2b188028c5299cedcc1e upstream.
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-Cc: Marcin Wojtas <mw@semihalf.com>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-@@ -667,10 +667,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *p
- 
- void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root) {
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
-               if (IS_ERR(mvpp2_root))

diff --git a/queue-4.19/series b/queue-4.19/series
index e7cb79f2a482c3a9e5092e6d81b57a2e7b81c76a..0a4f53a6edbc76a1ead07f42a62babfdf1c73d97 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,7 +1,6 @@
 driver-core-don-t-probe-devices-after-bus_type.match-probe-deferral.patch
 efi-capsule-loader-fix-use-after-free-in-efi_capsule_write.patch
 wifi-iwlegacy-4965-corrected-fix-for-potential-off-by-one-overflow-in-il4965_rs_fill_link_cmd.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
 fs-only-do-a-memory-barrier-for-the-first-set_buffer_uptodate.patch
 revert-mm-kmemleak-take-a-full-lowmem-check-in-kmemleak_-_phys.patch
 net-dp83822-disable-false-carrier-interrupt.patch

diff --git a/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch b/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
deleted file mode 100644 (file)
index b194419..0000000
--- a/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fe2c9c61f668cde28dac2b188028c5299cedcc1e Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-commit fe2c9c61f668cde28dac2b188028c5299cedcc1e upstream.
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-Cc: Marcin Wojtas <mw@semihalf.com>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-@@ -700,10 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *p
- 
- void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 

diff --git a/queue-5.10/series b/queue-5.10/series
index fcb40466a17586a7a82a54421b410deda12ee61b..19a4bb95e2c5372400f926a8e8e04fcdc5419626 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -5,7 +5,6 @@ tty-n_gsm-avoid-call-of-sleeping-functions-from-atomic-context.patch
 efi-libstub-disable-struct-randomization.patch
 efi-capsule-loader-fix-use-after-free-in-efi_capsule_write.patch
 wifi-iwlegacy-4965-corrected-fix-for-potential-off-by-one-overflow-in-il4965_rs_fill_link_cmd.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
 fs-only-do-a-memory-barrier-for-the-first-set_buffer_uptodate.patch
 revert-mm-kmemleak-take-a-full-lowmem-check-in-kmemleak_-_phys.patch
 scsi-qla2xxx-disable-atio-interrupt-coalesce-for-qua.patch

diff --git a/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch b/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
deleted file mode 100644 (file)
index b194419..0000000
--- a/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fe2c9c61f668cde28dac2b188028c5299cedcc1e Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-commit fe2c9c61f668cde28dac2b188028c5299cedcc1e upstream.
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-Cc: Marcin Wojtas <mw@semihalf.com>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-@@ -700,10 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *p
- 
- void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 

diff --git a/queue-5.15/series b/queue-5.15/series
index e6a1b3695cbf2ece961e83a849465e95964287fa..2c82f36ffdc1eac24467519d5fea0a708136f512 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -2,7 +2,6 @@ net-wwan-iosm-remove-pointless-null-check.patch
 efi-libstub-disable-struct-randomization.patch
 efi-capsule-loader-fix-use-after-free-in-efi_capsule_write.patch
 wifi-iwlegacy-4965-corrected-fix-for-potential-off-by-one-overflow-in-il4965_rs_fill_link_cmd.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
 fs-only-do-a-memory-barrier-for-the-first-set_buffer_uptodate.patch
 revert-mm-kmemleak-take-a-full-lowmem-check-in-kmemleak_-_phys.patch
 scsi-qla2xxx-disable-atio-interrupt-coalesce-for-qua.patch

diff --git a/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch b/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
deleted file mode 100644 (file)
index b194419..0000000
--- a/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fe2c9c61f668cde28dac2b188028c5299cedcc1e Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-commit fe2c9c61f668cde28dac2b188028c5299cedcc1e upstream.
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-Cc: Marcin Wojtas <mw@semihalf.com>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-@@ -700,10 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *p
- 
- void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 

diff --git a/queue-5.19/series b/queue-5.19/series
index 24cc8dc5d39b3c432d42d0d6ddddbcb76809624e..f5faa0c3f33db917a447d1556d11e802aa3b1d1d 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -2,7 +2,6 @@ efi-libstub-disable-struct-randomization.patch
 efi-capsule-loader-fix-use-after-free-in-efi_capsule_write.patch
 wifi-mt76-mt7921e-fix-crash-in-chip-reset-fail.patch
 wifi-iwlegacy-4965-corrected-fix-for-potential-off-by-one-overflow-in-il4965_rs_fill_link_cmd.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs_lookup.patch
 fs-only-do-a-memory-barrier-for-the-first-set_buffer_uptodate.patch
 soc-fsl-select-fsl_guts-driver-for-dpio.patch
 revert-mm-kmemleak-take-a-full-lowmem-check-in-kmemleak_-_phys.patch