drop some broken 4.4 patches

diff --git a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch b/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch
deleted file mode 100644 (file)
index e22d4d8..0000000
--- a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 747df19747bc9752cd40b9cce761e17a033aa5c2 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <daniel@zonque.org>
-Date: Thu, 11 Oct 2018 20:32:05 +0200
-Subject: ASoC: sta32x: set ->component pointer in private struct
-
-From: Daniel Mack <daniel@zonque.org>
-
-commit 747df19747bc9752cd40b9cce761e17a033aa5c2 upstream.
-
-The ESD watchdog code in sta32x_watchdog() dereferences the pointer
-which is never assigned.
-
-This is a regression from a1be4cead9b950 ("ASoC: sta32x: Convert to direct
-regmap API usage.") which went unnoticed since nobody seems to use that ESD
-workaround.
-
-Fixes: a1be4cead9b950 ("ASoC: sta32x: Convert to direct regmap API usage.")
-Signed-off-by: Daniel Mack <daniel@zonque.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/sta32x.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/soc/codecs/sta32x.c
-+++ b/sound/soc/codecs/sta32x.c
-@@ -880,6 +880,9 @@ static int sta32x_probe(struct snd_soc_c
-       struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-       struct sta32x_platform_data *pdata = sta32x->pdata;
-       int i, ret = 0, thermal = 0;
-+
-+      sta32x->component = component;
-+
-       ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
-                                   sta32x->supplies);
-       if (ret != 0) {

diff --git a/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch b/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch
deleted file mode 100644 (file)
index 63b4127..0000000
--- a/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5bf59773aaf36dd62117dc83d50e1bbf9ef432da Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 27 Aug 2018 10:21:52 +0200
-Subject: NFC: nfcmrvl_uart: fix OF child-node lookup
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 5bf59773aaf36dd62117dc83d50e1bbf9ef432da upstream.
-
-Use the new of_get_compatible_child() helper to lookup the nfc child
-node instead of using of_find_compatible_node(), which searches the
-entire tree from a given start node and thus can return an unrelated
-(i.e. non-child) node.
-
-This also addresses a potential use-after-free (e.g. after probe
-deferral) as the tree-wide helper drops a reference to its first
-argument (i.e. the parent node).
-
-Fixes: e097dc624f78 ("NFC: nfcmrvl: add UART driver")
-Fixes: d8e018c0b321 ("NFC: nfcmrvl: update device tree bindings for Marvell NFC")
-Cc: stable <stable@vger.kernel.org>     # 4.2
-Cc: Vincent Cuissard <cuissard@marvell.com>
-Cc: Samuel Ortiz <sameo@linux.intel.com>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/nfc/nfcmrvl/uart.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/nfc/nfcmrvl/uart.c
-+++ b/drivers/nfc/nfcmrvl/uart.c
-@@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct
-       struct device_node *matched_node;
-       int ret;
- 
--      matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart");
-+      matched_node = of_get_compatible_child(node, "marvell,nfc-uart");
-       if (!matched_node) {
--              matched_node = of_find_compatible_node(node, NULL,
--                                                     "mrvl,nfc-uart");
-+              matched_node = of_get_compatible_child(node, "mrvl,nfc-uart");
-               if (!matched_node)
-                       return -ENODEV;
-       }

diff --git a/queue-4.4/series b/queue-4.4/series
index 4f28d6d4754b9bb0db5145324e91a2d27f3b9a25..616732f3f55f2da1d53922830171843eef036d35 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -51,7 +51,6 @@ xen-fix-race-in-xen_qlock_wait.patch
 xen-make-xen_qlock_wait-nestable.patch
 net-ipv4-defensive-cipso-option-parsing.patch
 libnvdimm-hold-reference-on-parent-while-scheduling-async-init.patch
-asoc-sta32x-set-component-pointer-in-private-struct.patch
 jbd2-fix-use-after-free-in-jbd2_log_do_checkpoint.patch
 gfs2_meta-mount-can-get-null-dev_name.patch
 ext4-initialize-retries-variable-in-ext4_da_write_inline_data_begin.patch
@@ -71,7 +70,6 @@ smb3-do-not-attempt-cifs-operation-in-smb3-query-info-error-path.patch
 smb3-on-kerberos-mount-if-server-doesn-t-specify-auth-type-use-krb5.patch
 printk-fix-panic-caused-by-passing-log_buf_len-to-command-line.patch
 genirq-fix-race-on-spurious-interrupt-detection.patch
-nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch
 nfsv4.1-fix-the-r-wsize-checking.patch
 nfsd-fix-an-oops-in-free_session.patch
 lockd-fix-access-beyond-unterminated-strings-in-prints.patch