drop a parisc pci patch from 4.4 and 4.9

diff --git a/queue-4.4/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch b/queue-4.4/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
deleted file mode 100644 (file)
index b2d7d4a..0000000
--- a/queue-4.4/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 9caea0007601d3bc6debec04f8b4cd6f4c2394be Mon Sep 17 00:00:00 2001
-From: Helge Deller <deller@gmx.de>
-Date: Sun, 19 Sep 2021 10:36:09 -0700
-Subject: parisc: Declare pci_iounmap() parisc version only when CONFIG_PCI enabled
-
-From: Helge Deller <deller@gmx.de>
-
-commit 9caea0007601d3bc6debec04f8b4cd6f4c2394be upstream.
-
-Linus noticed odd declaration rules for pci_iounmap() in iomap.h and
-pci_iomap.h, where it dependend on either NO_GENERIC_PCI_IOPORT_MAP or
-GENERIC_IOMAP when CONFIG_PCI was disabled.
-
-Testing on parisc seems to indicate that we need pci_iounmap() only when
-CONFIG_PCI is enabled, so the declaration of pci_iounmap() can be moved
-cleanly into pci_iomap.h in sync with the declarations of pci_iomap().
-
-Link: https://lore.kernel.org/all/CAHk-=wjRrh98pZoQ+AzfWmsTZacWxTJKXZ9eKU2X_0+jM=O8nw@mail.gmail.com/
-Signed-off-by: Helge Deller <deller@gmx.de>
-Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
-Fixes: 97a29d59fc22 ("[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional")
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Cc: Ulrich Teichert <krypton@ulrich-teichert.org>
-Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/parisc/lib/iomap.c         |    4 +++-
- include/asm-generic/iomap.h     |   10 ----------
- include/asm-generic/pci_iomap.h |    3 +++
- 3 files changed, 6 insertions(+), 11 deletions(-)
-
---- a/arch/parisc/lib/iomap.c
-+++ b/arch/parisc/lib/iomap.c
-@@ -436,12 +436,15 @@ void ioport_unmap(void __iomem *addr)
-       }
- }
- 
-+#ifdef CONFIG_PCI
- void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
- {
-       if (!INDIRECT_ADDR(addr)) {
-               iounmap(addr);
-       }
- }
-+EXPORT_SYMBOL(pci_iounmap);
-+#endif
- 
- EXPORT_SYMBOL(ioread8);
- EXPORT_SYMBOL(ioread16);
-@@ -461,4 +464,3 @@ EXPORT_SYMBOL(iowrite16_rep);
- EXPORT_SYMBOL(iowrite32_rep);
- EXPORT_SYMBOL(ioport_map);
- EXPORT_SYMBOL(ioport_unmap);
--EXPORT_SYMBOL(pci_iounmap);
---- a/include/asm-generic/iomap.h
-+++ b/include/asm-generic/iomap.h
-@@ -70,16 +70,6 @@ extern void ioport_unmap(void __iomem *)
- #define ioremap_wt ioremap_nocache
- #endif
- 
--#ifdef CONFIG_PCI
--/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
--struct pci_dev;
--extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
--#elif defined(CONFIG_GENERIC_IOMAP)
--struct pci_dev;
--static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
--{ }
--#endif
--
- #include <asm-generic/pci_iomap.h>
- 
- #endif
---- a/include/asm-generic/pci_iomap.h
-+++ b/include/asm-generic/pci_iomap.h
-@@ -22,6 +22,7 @@ extern void __iomem *pci_iomap_range(str
- extern void __iomem *pci_iomap_wc_range(struct pci_dev *dev, int bar,
-                                       unsigned long offset,
-                                       unsigned long maxlen);
-+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
- /* Create a virtual mapping cookie for a port on a given PCI device.
-  * Do not call this directly, it exists to make it easier for architectures
-  * to override */
-@@ -54,6 +55,8 @@ static inline void __iomem *pci_iomap_wc
- {
-       return NULL;
- }
-+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-+{ }
- #endif
- 
- #endif /* __ASM_GENERIC_IO_H */

diff --git a/queue-4.4/series b/queue-4.4/series
index d9acad802c1a7c73e5b2712330f0200e270906c3..bb76f9972b4aa290a9cdb822644ee47dbdff6659 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -120,7 +120,6 @@ net-caif-avoid-user-triggerable-warn_on-1.patch
 ptp-dp83640-don-t-define-page0.patch
 dccp-don-t-duplicate-ccid-when-cloning-dccp-sock.patch
 net-l2tp-fix-reference-count-leak-in-l2tp_udp_recv_core.patch
-parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
 r6040-restore-mdio-clock-frequency-after-mac-reset.patch
 tipc-increase-timeout-in-tipc_sk_enqueue.patch
 net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch

diff --git a/queue-4.9/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch b/queue-4.9/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
deleted file mode 100644 (file)
index 9476b9d..0000000
--- a/queue-4.9/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 9caea0007601d3bc6debec04f8b4cd6f4c2394be Mon Sep 17 00:00:00 2001
-From: Helge Deller <deller@gmx.de>
-Date: Sun, 19 Sep 2021 10:36:09 -0700
-Subject: parisc: Declare pci_iounmap() parisc version only when CONFIG_PCI enabled
-
-From: Helge Deller <deller@gmx.de>
-
-commit 9caea0007601d3bc6debec04f8b4cd6f4c2394be upstream.
-
-Linus noticed odd declaration rules for pci_iounmap() in iomap.h and
-pci_iomap.h, where it dependend on either NO_GENERIC_PCI_IOPORT_MAP or
-GENERIC_IOMAP when CONFIG_PCI was disabled.
-
-Testing on parisc seems to indicate that we need pci_iounmap() only when
-CONFIG_PCI is enabled, so the declaration of pci_iounmap() can be moved
-cleanly into pci_iomap.h in sync with the declarations of pci_iomap().
-
-Link: https://lore.kernel.org/all/CAHk-=wjRrh98pZoQ+AzfWmsTZacWxTJKXZ9eKU2X_0+jM=O8nw@mail.gmail.com/
-Signed-off-by: Helge Deller <deller@gmx.de>
-Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
-Fixes: 97a29d59fc22 ("[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional")
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Cc: Ulrich Teichert <krypton@ulrich-teichert.org>
-Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/parisc/lib/iomap.c         |    4 +++-
- include/asm-generic/iomap.h     |   10 ----------
- include/asm-generic/pci_iomap.h |    3 +++
- 3 files changed, 6 insertions(+), 11 deletions(-)
-
---- a/arch/parisc/lib/iomap.c
-+++ b/arch/parisc/lib/iomap.c
-@@ -436,12 +436,15 @@ void ioport_unmap(void __iomem *addr)
-       }
- }
- 
-+#ifdef CONFIG_PCI
- void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
- {
-       if (!INDIRECT_ADDR(addr)) {
-               iounmap(addr);
-       }
- }
-+EXPORT_SYMBOL(pci_iounmap);
-+#endif
- 
- EXPORT_SYMBOL(ioread8);
- EXPORT_SYMBOL(ioread16);
-@@ -461,4 +464,3 @@ EXPORT_SYMBOL(iowrite16_rep);
- EXPORT_SYMBOL(iowrite32_rep);
- EXPORT_SYMBOL(ioport_map);
- EXPORT_SYMBOL(ioport_unmap);
--EXPORT_SYMBOL(pci_iounmap);
---- a/include/asm-generic/iomap.h
-+++ b/include/asm-generic/iomap.h
-@@ -78,16 +78,6 @@ extern void ioport_unmap(void __iomem *)
- #define ioremap_wt ioremap_nocache
- #endif
- 
--#ifdef CONFIG_PCI
--/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
--struct pci_dev;
--extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
--#elif defined(CONFIG_GENERIC_IOMAP)
--struct pci_dev;
--static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
--{ }
--#endif
--
- #include <asm-generic/pci_iomap.h>
- 
- #endif
---- a/include/asm-generic/pci_iomap.h
-+++ b/include/asm-generic/pci_iomap.h
-@@ -22,6 +22,7 @@ extern void __iomem *pci_iomap_range(str
- extern void __iomem *pci_iomap_wc_range(struct pci_dev *dev, int bar,
-                                       unsigned long offset,
-                                       unsigned long maxlen);
-+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
- /* Create a virtual mapping cookie for a port on a given PCI device.
-  * Do not call this directly, it exists to make it easier for architectures
-  * to override */
-@@ -54,6 +55,8 @@ static inline void __iomem *pci_iomap_wc
- {
-       return NULL;
- }
-+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-+{ }
- #endif
- 
- #endif /* __ASM_GENERIC_IO_H */

diff --git a/queue-4.9/series b/queue-4.9/series
index 5a2d57ae7b3ce39130e3920f765eb92c1ecfbd02..46e365452ccc1781abf3eb9d8b68ea34846fd37f 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -156,9 +156,10 @@ net-caif-avoid-user-triggerable-warn_on-1.patch
 ptp-dp83640-don-t-define-page0.patch
 dccp-don-t-duplicate-ccid-when-cloning-dccp-sock.patch
 net-l2tp-fix-reference-count-leak-in-l2tp_udp_recv_core.patch
-parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch
 r6040-restore-mdio-clock-frequency-after-mac-reset.patch
 tipc-increase-timeout-in-tipc_sk_enqueue.patch
 events-reuse-value-read-using-read_once-instead-of-re-reading-it.patch
 net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch
 revert-ipv4-fix-memory-leaks-in-ip_cmsg_send-callers.patch
+tcp-fix-tp-undo_retrans-accounting-in-tcp_sacktag_one.patch
+ibmvnic-check-failover_pending-in-login-response.patch