drop broken of-unittest patch for 4.4, 4.9, and 4.14

diff --git a/queue-4.14/of-unittest-kmemleak-in-of_unittest_platform_populat.patch b/queue-4.14/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
index 4cd5c8b8d15a78b09785bfc482d09aa91aa4b299..b69deaaae2af4da766fd3bbd7503395d536455fa 100644 (file)
--- a/queue-4.14/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
+++ b/queue-4.14/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
@@ -20,14 +20,12 @@ Signed-off-by: Frank Rowand <frank.rowand@sony.com>
 Signed-off-by: Rob Herring <robh@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/of/unittest.c | 7 +++++--
+ drivers/of/unittest.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
-index aaec4a9fa2bc4..e7e6dd07f2150 100644
 --- a/drivers/of/unittest.c
 +++ b/drivers/of/unittest.c
-@@ -891,10 +891,13 @@ static void __init of_unittest_platform_populate(void)
+@@ -887,10 +887,13 @@ static void __init of_unittest_platform_
  
        of_platform_populate(np, match, NULL, &test_bus->dev);
        for_each_child_of_node(np, child) {
@@ -43,6 +41,3 @@ index aaec4a9fa2bc4..e7e6dd07f2150 100644
        }
  
        of_platform_depopulate(&test_bus->dev);
--- 
-2.20.1
-

diff --git a/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch
deleted file mode 100644 (file)
index 6cdcf9e..0000000
--- a/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b3fb36ed694b05738d45218ea72cf7feb10ce2b1 Mon Sep 17 00:00:00 2001
-From: Frank Rowand <frank.rowand@sony.com>
-Date: Thu, 16 Apr 2020 16:42:46 -0500
-Subject: of: unittest: kmemleak on changeset destroy
-
-From: Frank Rowand <frank.rowand@sony.com>
-
-commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 upstream.
-
-kmemleak reports several memory leaks from devicetree unittest.
-This is the fix for problem 1 of 5.
-
-of_unittest_changeset() reaches deeply into the dynamic devicetree
-functions.  Several nodes were left with an elevated reference
-count and thus were not properly cleaned up.  Fix the reference
-counts so that the memory will be freed.
-
-Fixes: 201c910bd689 ("of: Transactional DT support.")
-Reported-by: Erhard F. <erhard_f@mailbox.org>
-Signed-off-by: Frank Rowand <frank.rowand@sony.com>
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/of/unittest.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/of/unittest.c
-+++ b/drivers/of/unittest.c
-@@ -605,6 +605,10 @@ static void __init of_unittest_changeset
-       unittest(!of_changeset_revert(&chgset), "revert failed\n");
- 
-       of_changeset_destroy(&chgset);
-+
-+      of_node_put(n1);
-+      of_node_put(n2);
-+      of_node_put(n21);
- #endif
- }
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index b72bdbd2b14159b61c5917251ba71dc027e75234..41c50bcb7c3573fe537e52777a4b4003606ace00 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -140,7 +140,6 @@ arm-bpf-fix-bugs-with-alu64-rsh-arsh-bpf_k-shift-by-0.patch
 netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch
 irqchip-mbigen-free-msi_desc-on-device-teardown.patch
 alsa-hda-don-t-release-card-at-firmware-loading-error.patch
-of-unittest-kmemleak-on-changeset-destroy.patch
 lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch
 video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch
 drm-null-pointer-dereference-cwe-476-problem.patch

diff --git a/queue-4.4/of-unittest-kmemleak-in-of_unittest_platform_populat.patch b/queue-4.4/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
index b3baf01ce18d7d31ae57f1b0172bc3099b5fcb74..acd58f9f3b0b2554b5d94c7de1c34170f1aa843f 100644 (file)
--- a/queue-4.4/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
+++ b/queue-4.4/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
@@ -20,14 +20,12 @@ Signed-off-by: Frank Rowand <frank.rowand@sony.com>
 Signed-off-by: Rob Herring <robh@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/of/unittest.c | 7 +++++--
+ drivers/of/unittest.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
-index 1ee2474fa8fbb..109497dbfba08 100644
 --- a/drivers/of/unittest.c
 +++ b/drivers/of/unittest.c
-@@ -816,10 +816,13 @@ static void __init of_unittest_platform_populate(void)
+@@ -812,10 +812,13 @@ static void __init of_unittest_platform_
  
        of_platform_populate(np, match, NULL, &test_bus->dev);
        for_each_child_of_node(np, child) {
@@ -43,6 +41,3 @@ index 1ee2474fa8fbb..109497dbfba08 100644
        }
  
        of_platform_depopulate(&test_bus->dev);
--- 
-2.20.1
-

diff --git a/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch
deleted file mode 100644 (file)
index 82a8d87..0000000
--- a/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b3fb36ed694b05738d45218ea72cf7feb10ce2b1 Mon Sep 17 00:00:00 2001
-From: Frank Rowand <frank.rowand@sony.com>
-Date: Thu, 16 Apr 2020 16:42:46 -0500
-Subject: of: unittest: kmemleak on changeset destroy
-
-From: Frank Rowand <frank.rowand@sony.com>
-
-commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 upstream.
-
-kmemleak reports several memory leaks from devicetree unittest.
-This is the fix for problem 1 of 5.
-
-of_unittest_changeset() reaches deeply into the dynamic devicetree
-functions.  Several nodes were left with an elevated reference
-count and thus were not properly cleaned up.  Fix the reference
-counts so that the memory will be freed.
-
-Fixes: 201c910bd689 ("of: Transactional DT support.")
-Reported-by: Erhard F. <erhard_f@mailbox.org>
-Signed-off-by: Frank Rowand <frank.rowand@sony.com>
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/of/unittest.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/of/unittest.c
-+++ b/drivers/of/unittest.c
-@@ -544,6 +544,10 @@ static void __init of_unittest_changeset
-       mutex_unlock(&of_mutex);
- 
-       of_changeset_destroy(&chgset);
-+
-+      of_node_put(n1);
-+      of_node_put(n2);
-+      of_node_put(n21);
- #endif
- }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index 9919d0713e2ff8e8ccf3929cafaa40175ae02027..f31ee19b47f9851717bdd8d63960f0ec31c4d47f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -70,7 +70,6 @@ x86-mitigations-clear-cpu-buffers-on-the-syscall-fast-path.patch
 tracing-fix-the-race-between-registering-snapshot-event-trigger-and-triggering-snapshot-operation.patch
 scsi-sg-add-sg_remove_request-in-sg_common_write.patch
 alsa-hda-don-t-release-card-at-firmware-loading-error.patch
-of-unittest-kmemleak-on-changeset-destroy.patch
 video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch
 drm-null-pointer-dereference-cwe-476-problem.patch
 wil6210-increase-firmware-ready-timeout.patch

diff --git a/queue-4.9/of-unittest-kmemleak-in-of_unittest_platform_populat.patch b/queue-4.9/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
index b712492d3cda539cd5c381c7ffc4696934acc2cc..dca68107396edafd5467cef9a34aac40032e3d56 100644 (file)
--- a/queue-4.9/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
+++ b/queue-4.9/of-unittest-kmemleak-in-of_unittest_platform_populat.patch
@@ -20,14 +20,12 @@ Signed-off-by: Frank Rowand <frank.rowand@sony.com>
 Signed-off-by: Rob Herring <robh@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/of/unittest.c | 7 +++++--
+ drivers/of/unittest.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
-index 40d170c1ecd50..144d123f6ea4f 100644
 --- a/drivers/of/unittest.c
 +++ b/drivers/of/unittest.c
-@@ -825,10 +825,13 @@ static void __init of_unittest_platform_populate(void)
+@@ -821,10 +821,13 @@ static void __init of_unittest_platform_
  
        of_platform_populate(np, match, NULL, &test_bus->dev);
        for_each_child_of_node(np, child) {
@@ -43,6 +41,3 @@ index 40d170c1ecd50..144d123f6ea4f 100644
        }
  
        of_platform_depopulate(&test_bus->dev);
--- 
-2.20.1
-

diff --git a/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch
deleted file mode 100644 (file)
index f898b42..0000000
--- a/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b3fb36ed694b05738d45218ea72cf7feb10ce2b1 Mon Sep 17 00:00:00 2001
-From: Frank Rowand <frank.rowand@sony.com>
-Date: Thu, 16 Apr 2020 16:42:46 -0500
-Subject: of: unittest: kmemleak on changeset destroy
-
-From: Frank Rowand <frank.rowand@sony.com>
-
-commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 upstream.
-
-kmemleak reports several memory leaks from devicetree unittest.
-This is the fix for problem 1 of 5.
-
-of_unittest_changeset() reaches deeply into the dynamic devicetree
-functions.  Several nodes were left with an elevated reference
-count and thus were not properly cleaned up.  Fix the reference
-counts so that the memory will be freed.
-
-Fixes: 201c910bd689 ("of: Transactional DT support.")
-Reported-by: Erhard F. <erhard_f@mailbox.org>
-Signed-off-by: Frank Rowand <frank.rowand@sony.com>
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/of/unittest.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/of/unittest.c
-+++ b/drivers/of/unittest.c
-@@ -539,6 +539,10 @@ static void __init of_unittest_changeset
-       unittest(!of_changeset_revert(&chgset), "revert failed\n");
- 
-       of_changeset_destroy(&chgset);
-+
-+      of_node_put(n1);
-+      of_node_put(n2);
-+      of_node_put(n21);
- #endif
- }
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index 0cfbb536d5b91fad82dcb0c5e6464853e84731fe..c8430981d4949bdbd945b3c8e836ac95d513f6ce 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -85,7 +85,6 @@ tracing-fix-the-race-between-registering-snapshot-event-trigger-and-triggering-s
 objtool-fix-switch-table-detection-in-.text.unlikely.patch
 scsi-sg-add-sg_remove_request-in-sg_common_write.patch
 alsa-hda-don-t-release-card-at-firmware-loading-error.patch
-of-unittest-kmemleak-on-changeset-destroy.patch
 video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch
 drm-null-pointer-dereference-cwe-476-problem.patch
 revert-gpio-set-up-initial-state-from-.get_direction.patch