drop nfc patch from 4.14

diff --git a/queue-4.14/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch b/queue-4.14/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch
deleted file mode 100644 (file)
index 63b4127..0000000
--- a/queue-4.14/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.14/series b/queue-4.14/series
index 505bd137cc7a838cb3a2e4c99fb8a1b4ceea0c00..e5ec7df39ede7bb41a7f0e27b4f0f022b0dccee3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -168,7 +168,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
 nfs-fix-a-missed-page-unlock-after-pg_doio.patch
 nfsd-fix-an-oops-in-free_session.patch