[PATCH 1/2] copy-list: remove wil6210_uapi.h

[PATCH 1/2] copy-list: remove wil6210_uapi.h

[AceLan Kao]

>From below commit, the file has been removed
   a520b49 wil6210: remove ioctl interface

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 copy-list | 1 -
 1 file changed, 1 deletion(-)

diff --git a/copy-list b/copy-list
index a61e95b..52df0ea 100644
--- a/copy-list
+++ b/copy-list
@@ -31,7 +31,6 @@ include/linux/pci_ids.h
 include/uapi/linux/pci_regs.h
 include/linux/mmc/sdio_ids.h
 include/linux/ath9k_platform.h
-include/uapi/linux/wil6210_uapi.h
 include/linux/wl12xx.h
 include/linux/rndis.h
 include/linux/bcm47xx_wdt.h
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 2/2] copy-list: remove st-nci.h and patch

[AceLan Kao]

>From below commit, st-nci.h has been removed
   61a0410 NFC: st-nci: Get rid of platform data
And we don't need st-nci-spi.patch, either. The patch is included in
upstream kernel source.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 copy-list                                           |  1 -
 patches/0013-fix-makefile-includes/st-nci-spi.patch | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 patches/0013-fix-makefile-includes/st-nci-spi.patch

diff --git a/copy-list b/copy-list
index 52df0ea..5f6bf42 100644
--- a/copy-list
+++ b/copy-list
@@ -116,7 +116,6 @@ include/uapi/linux/nfc.h
 drivers/nfc/
 include/linux/platform_data/nfcmrvl.h
 include/linux/platform_data/nxp-nci.h
-include/linux/platform_data/st-nci.h
 
 # MPLS labels, checked on skb->protocol on the
 # respective 802 family, only ethernet seems to use
diff --git a/patches/0013-fix-makefile-includes/st-nci-spi.patch b/patches/0013-fix-makefile-includes/st-nci-spi.patch
deleted file mode 100644
index 1ecd161..0000000
--- a/patches/0013-fix-makefile-includes/st-nci-spi.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/nfc/st-nci/spi.c
-+++ b/drivers/nfc/st-nci/spi.c
-@@ -21,6 +21,7 @@
- #include <linux/spi/spi.h>
- #include <linux/gpio.h>
- #include <linux/gpio/consumer.h>
-+#include <linux/of.h>
- #include <linux/of_irq.h>
- #include <linux/of_gpio.h>
- #include <linux/acpi.h>
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in

Re: [PATCH 2/2] copy-list: remove st-nci.h and patch

[Johannes Berg]

On Fri, 2017-07-14 at 11:07 +0800, AceLan Kao wrote:
> From below commit, st-nci.h has been removed
>    61a0410 NFC: st-nci: Get rid of platform data
> And we don't need st-nci-spi.patch, either. The patch is included in
> upstream kernel source.
> 
Both applied, but it'd have been nicer to split the second patch into
two since it's two very different things.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in