backports.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/19] backports: bring to next-20160324
@ 2016-07-10 21:14 Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 01/19] copy-list: rename brcmfmac.h Hauke Mehrtens
                   ` (19 more replies)
  0 siblings, 20 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

This add various stuff needed for next-20160324.

Hauke Mehrtens (19):
  copy-list: rename brcmfmac.h
  copy-list: add media/tvp5150.h header file
  dependencies: deactivate igb on kernel < 3.11
  header: adapt get_user_pages_{locked,unlocked} signature
  header: remove vid parameter from ndo_dflt_fdb_add()
  header: add ipv6_addr_prefix_copy()
  header: add missing S16_MIN and S16_MAX
  header: add empty for_each_child_of_node()
  header: adapt thermal_zone_device_register() signature changes
  header: add thermal_notify_framework()
  patches: do not call of_irq_* functions on kernel < 3.13 in bcma
  patches: make iwlwifi use the old thermal APIs
  patches: remove usage of the head_frag member of skb
  patch: add include for net/ipv6.h to igb_main.c
  backports: add rhashtable_walk_init()
  patches: refresh on next-20160324
  gentree.py: print some more error messages when spatch fails.
  devel: update test kernel versions
  defconfig: update defconfigs, some options changed in the kernel.

 backport/backport-include/linux/kernel.h           |  8 +++
 backport/backport-include/linux/mm.h               | 45 ++++++++++++----
 backport/backport-include/linux/of.h               |  5 ++
 backport/backport-include/linux/rhashtable.h       | 12 +++++
 backport/backport-include/linux/rtnetlink.h        |  6 +++
 backport/backport-include/linux/thermal.h          | 27 ++++++++++
 backport/backport-include/net/ipv6.h               | 18 +++++++
 backport/compat/Makefile                           |  1 +
 backport/compat/backport-4.0.c                     | 18 +++----
 backport/compat/backport-4.7.c                     | 62 ++++++++++++++++++++++
 backport/defconfigs/ar5523                         |  2 +-
 backport/defconfigs/ath10k                         |  2 +-
 backport/defconfigs/ath5k                          |  2 +-
 backport/defconfigs/ath6kl                         |  2 +-
 backport/defconfigs/ath9k                          |  2 +-
 backport/defconfigs/ath9k-debug                    |  2 +-
 backport/defconfigs/carl9170                       |  2 +-
 backport/defconfigs/media                          |  5 --
 backport/defconfigs/wcn36xx                        |  2 +-
 backport/defconfigs/wifi                           | 18 +++++--
 backport/defconfigs/wil6210                        |  2 +-
 copy-list                                          |  4 +-
 dependencies                                       |  3 +-
 devel/backports-update-manager                     | 21 ++++----
 gentree.py                                         |  2 +-
 .../media/0004-missing-include/media-device.patch  |  2 +-
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 +-
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../network/0013-fix-makefile-includes/igb.patch   | 12 +++++
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0025-usb-sg/usbnet.patch               |  2 +-
 .../0032-sriov_configure/igb_sriov_configure.patch |  4 +-
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 23 +++++---
 .../0043-ndo_set_vf_rate/igb_set_vf_rate.patch     |  4 +-
 .../network/0052-deactivate-ptp-pin/igb.patch      | 16 +++---
 .../network/0053-possible_net_t.patch              |  2 +-
 .../0053-remove_wait_on_bit_timeout/btusb.patch    | 12 ++---
 .../network/0055-name_assign_type/brcmfmac.patch   |  2 +-
 .../network/0062-acpi-gpio-remove/hci_bcm.patch    |  2 +-
 .../network/0069-remove-of_irq/bcma.patch          | 26 +++++++++
 .../network/0070-thermal/iwlwifi.patch             | 58 ++++++++++++++++++++
 .../network/0071-skb-head_frag/wireless.patch      | 16 ++++++
 .../network/0072-netdevice-ndo_fdb_add/igb.patch   | 16 ++++++
 45 files changed, 394 insertions(+), 88 deletions(-)
 create mode 100644 backport/backport-include/linux/rhashtable.h
 create mode 100644 backport/backport-include/linux/thermal.h
 create mode 100644 backport/compat/backport-4.7.c
 create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/igb.patch
 create mode 100644 patches/collateral-evolutions/network/0069-remove-of_irq/bcma.patch
 create mode 100644 patches/collateral-evolutions/network/0070-thermal/iwlwifi.patch
 create mode 100644 patches/collateral-evolutions/network/0071-skb-head_frag/wireless.patch
 create mode 100644 patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch

-- 
2.8.1

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* [PATCH 01/19] copy-list: rename brcmfmac.h
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 02/19] copy-list: add media/tvp5150.h header file Hauke Mehrtens
                   ` (18 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

The brcmfmac-sdio.h was renamed to brcmfmac.h.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 copy-list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/copy-list b/copy-list
index bd99364..f4740f6 100644
--- a/copy-list
+++ b/copy-list
@@ -35,7 +35,7 @@ include/linux/usb/usbnet.h
 include/linux/usb/cdc.h
 include/linux/usb/rndis_host.h
 include/linux/spi/libertas_spi.h
-include/linux/platform_data/brcmfmac-sdio.h
+include/linux/platform_data/brcmfmac.h
 include/linux/platform_data/net-cw1200.h
 include/uapi/linux/nl80211.h
 
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 02/19] copy-list: add media/tvp5150.h header file
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 01/19] copy-list: rename brcmfmac.h Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 03/19] dependencies: deactivate igb on kernel < 3.11 Hauke Mehrtens
                   ` (17 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

This header file is now used by some driver.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 copy-list | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/copy-list b/copy-list
index f4740f6..48b26ca 100644
--- a/copy-list
+++ b/copy-list
@@ -150,6 +150,8 @@ drivers/staging/media/cxd2099/cxd2099.h
 include/uapi/linux/ivtv.h
 include/uapi/linux/meye.h
 
+include/dt-bindings/media/tvp5150.h
+
 drivers/media/
 include/linux/platform_data/media/gpio-ir-recv.h
 include/linux/of_graph.h
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 03/19] dependencies: deactivate igb on kernel < 3.11
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 01/19] copy-list: rename brcmfmac.h Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 02/19] copy-list: add media/tvp5150.h header file Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 04/19] header: adapt get_user_pages_{locked,unlocked} signature Hauke Mehrtens
                   ` (16 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

igb now needs the mpls_features member on skb_buff, which was added
with kernel 3.11, deactivate it till this gets backported.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dependencies b/dependencies
index 1af2c0f..2a51bcc 100644
--- a/dependencies
+++ b/dependencies
@@ -136,7 +136,8 @@ ATH9K_HWRNG 3.17
 # and since net_get_random_once() depends on static keys we've decided
 # to backport that only down to 3.5. For full details refer to backports
 # commit 8cb8816d
-IGB 3.5
+# mpls_features was added with kernel 3.11
+IGB 3.11
 
 # This driver needs mmc_hw_reset() which was added in kernel version 3.2
 MWIFIEX_SDIO 3.2
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 04/19] header: adapt get_user_pages_{locked,unlocked} signature
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (2 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 03/19] dependencies: deactivate igb on kernel < 3.11 Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 05/19] header: remove vid parameter from ndo_dflt_fdb_add() Hauke Mehrtens
                   ` (15 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

The first two parameters of get_user_pages_locked(),
__get_user_pages_unlocked() and get_user_pages() were removed in
upstream Linux kernel commit cde70140fe "mm/gup: Overload
get_user_pages() functions". In addition remove
__get_user_pages_unlocked() which is not used by any driver.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/mm.h | 45 +++++++++++++++++++++++++++---------
 backport/compat/backport-4.0.c       | 18 +++++++--------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h
index 5b3cca6..7dda9e5 100644
--- a/backport/backport-include/linux/mm.h
+++ b/backport/backport-include/linux/mm.h
@@ -2,6 +2,7 @@
 #define __BACKPORT_MM_H
 #include_next <linux/mm.h>
 #include <linux/page_ref.h>
+#include <linux/sched.h>
 
 #ifndef VM_NODUMP
 /*
@@ -28,19 +29,41 @@ void kvfree(const void *addr);
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0))
 #define get_user_pages_locked LINUX_BACKPORT(get_user_pages_locked)
-long get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm,
-		    unsigned long start, unsigned long nr_pages,
-		    int write, int force, struct page **pages,
-		    int *locked);
-#define __get_user_pages_unlocked LINUX_BACKPORT(__get_user_pages_unlocked)
-long __get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
-			       unsigned long start, unsigned long nr_pages,
-			       int write, int force, struct page **pages,
-			       unsigned int gup_flags);
+long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
+		    int write, int force, struct page **pages, int *locked);
 #define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
-long get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
-		    unsigned long start, unsigned long nr_pages,
+long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
 		    int write, int force, struct page **pages);
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0))
+static inline
+long backport_get_user_pages_locked(unsigned long start, unsigned long nr_pages,
+		    int write, int force, struct page **pages, int *locked)
+{
+	return get_user_pages_locked(current, current->mm, start, nr_pages,
+		    write, force, pages, locked);
+}
+#define get_user_pages_locked LINUX_BACKPORT(get_user_pages_locked)
+
+static inline
+long backport_get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
+				      int write, int force, struct page **pages)
+{
+	return get_user_pages_unlocked(current, current->mm, start,  nr_pages,
+		    write, force, pages);
+}
+#define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0))
+static inline
+long backport_get_user_pages(unsigned long start, unsigned long nr_pages,
+			    int write, int force, struct page **pages,
+			    struct vm_area_struct **vmas)
+{
+	return get_user_pages(current, current->mm, start,  nr_pages,
+		    write, force, pages, vmas);
+}
+#define get_user_pages LINUX_BACKPORT(get_user_pages)
 #endif
 
 #ifndef FOLL_TRIED
diff --git a/backport/compat/backport-4.0.c b/backport/compat/backport-4.0.c
index acec0af..8ae1611 100644
--- a/backport/compat/backport-4.0.c
+++ b/backport/compat/backport-4.0.c
@@ -133,13 +133,13 @@ static __always_inline long __get_user_pages_locked(struct task_struct *tsk,
  *      if (locked)
  *          up_read(&mm->mmap_sem);
  */
-long get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm,
-			   unsigned long start, unsigned long nr_pages,
+long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
 			   int write, int force, struct page **pages,
 			   int *locked)
 {
-	return __get_user_pages_locked(tsk, mm, start, nr_pages, write, force,
-				       pages, NULL, locked, true, FOLL_TOUCH);
+	return __get_user_pages_locked(current, current->mm, start, nr_pages,
+				       write, force, pages, NULL, locked, true,
+				       FOLL_TOUCH);
 }
 EXPORT_SYMBOL_GPL(get_user_pages_locked);
 
@@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(get_user_pages_locked);
  * according to the parameters "pages", "write", "force"
  * respectively.
  */
-__always_inline long __get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
+static __always_inline long __get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
 					       unsigned long start, unsigned long nr_pages,
 					       int write, int force, struct page **pages,
 					       unsigned int gup_flags)
@@ -167,7 +167,6 @@ __always_inline long __get_user_pages_unlocked(struct task_struct *tsk, struct m
 		up_read(&mm->mmap_sem);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(__get_user_pages_unlocked);
 
 /*
  * get_user_pages_unlocked() is suitable to replace the form:
@@ -186,12 +185,11 @@ EXPORT_SYMBOL_GPL(__get_user_pages_unlocked);
  * or if "force" shall be set to 1 (get_user_pages_fast misses the
  * "force" parameter).
  */
-long get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
-			     unsigned long start, unsigned long nr_pages,
+long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
 			     int write, int force, struct page **pages)
 {
-	return __get_user_pages_unlocked(tsk, mm, start, nr_pages, write,
-					 force, pages, FOLL_TOUCH);
+	return __get_user_pages_unlocked(current, current->mm, start, nr_pages,
+					 write, force, pages, FOLL_TOUCH);
 }
 EXPORT_SYMBOL_GPL(get_user_pages_unlocked);
 
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 05/19] header: remove vid parameter from ndo_dflt_fdb_add()
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (3 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 04/19] header: adapt get_user_pages_{locked,unlocked} signature Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 06/19] header: add ipv6_addr_prefix_copy() Hauke Mehrtens
                   ` (14 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

The signature was changed in Linux kernel commit f6f6424ba "net: make
vid as a parameter for ndo_fdb_add/ndo_fdb_del".

In addition the signature of the callback ndo_fdb_add was also changed.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/rtnetlink.h              |  6 ++++++
 .../network/0072-netdevice-ndo_fdb_add/igb.patch         | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch

diff --git a/backport/backport-include/linux/rtnetlink.h b/backport/backport-include/linux/rtnetlink.h
index 6dea700..806f212 100644
--- a/backport/backport-include/linux/rtnetlink.h
+++ b/backport/backport-include/linux/rtnetlink.h
@@ -13,4 +13,10 @@
 				 lockdep_rtnl_is_held())
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
+#define ndo_dflt_fdb_add(ndm, tb, dev, addr, vid, flags) \
+	ndo_dflt_fdb_add(ndm, tb, dev, addr, flags)
+#endif
+
+			    
 #endif /* __BACKPORT_LINUX_RTNETLINK_H */
diff --git a/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
new file mode 100644
index 0000000..c50fe51
--- /dev/null
+++ b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
@@ -0,0 +1,16 @@
+diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
+index 55a1405c..31edad7 100644
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -2077,7 +2077,11 @@ static int igb_set_features(struct net_d
+ 
+ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
+ 			   struct net_device *dev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
++			   const unsigned char *addr,
++#else
+ 			   const unsigned char *addr, u16 vid,
++#endif
+ 			   u16 flags)
+ {
+ 	/* guarantee we can provide a unique filter for the unicast address */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 06/19] header: add ipv6_addr_prefix_copy()
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (4 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 05/19] header: remove vid parameter from ndo_dflt_fdb_add() Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 07/19] header: add missing S16_MIN and S16_MAX Hauke Mehrtens
                   ` (13 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

This was added in commit 818f1f3e7 "ipv6: add ipv6_addr_prefix_copy" to
mainline Linux kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/net/ipv6.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/backport/backport-include/net/ipv6.h b/backport/backport-include/net/ipv6.h
index 9da13eb..762ad78 100644
--- a/backport/backport-include/net/ipv6.h
+++ b/backport/backport-include/net/ipv6.h
@@ -39,4 +39,22 @@ static inline u32 ipv6_addr_hash(const struct in6_addr *a)
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
+#define ipv6_addr_prefix_copy LINUX_BACKPORT(ipv6_addr_prefix_copy)
+static inline void ipv6_addr_prefix_copy(struct in6_addr *addr,
+					 const struct in6_addr *pfx,
+					 int plen)
+{
+	/* caller must guarantee 0 <= plen <= 128 */
+	int o = plen >> 3,
+	    b = plen & 0x7;
+
+	memcpy(addr->s6_addr, pfx, o);
+	if (b != 0) {
+		addr->s6_addr[o] &= ~(0xff00 >> b);
+		addr->s6_addr[o] |= (pfx->s6_addr[o] & (0xff00 >> b));
+	}
+}
+#endif
+
 #endif /* __BACKPORT_NET_IPV6_H */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 07/19] header: add missing S16_MIN and S16_MAX
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (5 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 06/19] header: add ipv6_addr_prefix_copy() Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 08/19] header: add empty for_each_child_of_node() Hauke Mehrtens
                   ` (12 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

These are now needed by the iwlwifi driver and were added in commit
89a0714106a "kernel.h: define u8, s8, u32, etc. limits"

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/kernel.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backport/backport-include/linux/kernel.h b/backport/backport-include/linux/kernel.h
index f47b21f..fd7aa2b 100644
--- a/backport/backport-include/linux/kernel.h
+++ b/backport/backport-include/linux/kernel.h
@@ -61,6 +61,14 @@
 #define U16_MAX		((u16)~0U)
 #endif
 
+#ifndef S16_MAX
+#define S16_MAX		((s16)(U16_MAX>>1))
+#endif
+
+#ifndef S16_MIN
+#define S16_MIN		((s16)(-S16_MAX - 1))
+#endif
+
 #ifndef U32_MAX
 #define U32_MAX		((u32)~0U)
 #endif
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 08/19] header: add empty for_each_child_of_node()
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (6 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 07/19] header: add missing S16_MIN and S16_MAX Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 09/19] header: adapt thermal_zone_device_register() signature changes Hauke Mehrtens
                   ` (11 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

This is needed by bcma driver and was added to mainline kernel in
commit aba3dfff9a "dt: add empty for_each_child_of_node,
of_find_property".

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/of.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backport/backport-include/linux/of.h b/backport/backport-include/linux/of.h
index 8089803..1a38034 100644
--- a/backport/backport-include/linux/of.h
+++ b/backport/backport-include/linux/of.h
@@ -199,4 +199,9 @@ static inline const char* of_node_full_name(const struct device_node *np)
 #endif /* CONFIG_OF */
 #endif /* < 3.6 */
 
+#ifndef for_each_child_of_node
+#define for_each_child_of_node(parent, child) \
+	while (0)
+#endif
+
 #endif	/* _COMPAT_LINUX_OF_H */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 09/19] header: adapt thermal_zone_device_register() signature changes
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (7 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 08/19] header: add empty for_each_child_of_node() Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 10/19] header: add thermal_notify_framework() Hauke Mehrtens
                   ` (10 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

The signature of thermal_zone_device_register() changed for kernel <
3.10 multiple times, adapt the backports code to the old signature.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/thermal.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 backport/backport-include/linux/thermal.h

diff --git a/backport/backport-include/linux/thermal.h b/backport/backport-include/linux/thermal.h
new file mode 100644
index 0000000..c06dee6
--- /dev/null
+++ b/backport/backport-include/linux/thermal.h
@@ -0,0 +1,17 @@
+#ifndef __BACKPORT_THERMAL_H__
+#define __BACKPORT_THERMAL_H__
+#include_next <linux/thermal.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+#define thermal_zone_device_register(type, trips, mask, devdata, ops, tzp, passive_delay, polling_delay) \
+	thermal_zone_device_register(type, trips, devdata, ops, 0, 0, passive_delay, polling_delay)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+#define thermal_zone_device_register(type, trips, mask, devdata, ops, tzp, passive_delay, polling_delay) \
+	thermal_zone_device_register(type, trips, mask, devdata, ops, 0, 0, passive_delay, polling_delay)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+#define thermal_zone_device_register(type, trips, mask, devdata, ops, tzp, passive_delay, polling_delay) \
+	thermal_zone_device_register(type, trips, mask, devdata, ops, passive_delay, polling_delay)
+#endif /* < 3.8 */
+
+#endif /* __BACKPORT_THERMAL_H__ */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 10/19] header: add thermal_notify_framework()
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (8 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 09/19] header: adapt thermal_zone_device_register() signature changes Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 11/19] patches: do not call of_irq_* functions on kernel < 3.13 in bcma Hauke Mehrtens
                   ` (9 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

thermal_notify_framework() was renamed in kernel 3.10 and added in
kernel 3.8. Instead of calling the update only on the specified trip,
we call it on all in kernel < 3.8.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/thermal.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backport/backport-include/linux/thermal.h b/backport/backport-include/linux/thermal.h
index c06dee6..595f5c5 100644
--- a/backport/backport-include/linux/thermal.h
+++ b/backport/backport-include/linux/thermal.h
@@ -14,4 +14,14 @@
 	thermal_zone_device_register(type, trips, mask, devdata, ops, passive_delay, polling_delay)
 #endif /* < 3.8 */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+#define thermal_notify_framework LINUX_BACKPORT(thermal_notify_framework)
+static inline void thermal_notify_framework(struct thermal_zone_device *tz, int trip)
+{
+       thermal_zone_device_update(tz);
+}
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+#define thermal_notify_framework(tz, trip) notify_thermal_framework(tz, trip)
+#endif /* < 3.10 */
+
 #endif /* __BACKPORT_THERMAL_H__ */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 11/19] patches: do not call of_irq_* functions on kernel < 3.13 in bcma
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (9 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 10/19] header: add thermal_notify_framework() Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 12/19] patches: make iwlwifi use the old thermal APIs Hauke Mehrtens
                   ` (8 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

These functions where added in kernel renamed in kernel 3.13 and the
signature changed. I am not aware of any user of these functions in
such old kernel versions, just remove the part.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0069-remove-of_irq/bcma.patch          | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0069-remove-of_irq/bcma.patch

diff --git a/patches/collateral-evolutions/network/0069-remove-of_irq/bcma.patch b/patches/collateral-evolutions/network/0069-remove-of_irq/bcma.patch
new file mode 100644
index 0000000..351c0fd
--- /dev/null
+++ b/patches/collateral-evolutions/network/0069-remove-of_irq/bcma.patch
@@ -0,0 +1,26 @@
+diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
+index 1f63547..14bae02 100644
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -156,6 +156,7 @@ static struct device_node *bcma_of_find_
+ 	return NULL;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+ static int bcma_of_irq_parse(struct platform_device *parent,
+ 			     struct bcma_device *core,
+ 			     struct of_phandle_args *out_irq, int num)
+@@ -195,6 +196,13 @@ static unsigned int bcma_of_get_irq(stru
+ 
+ 	return irq_create_of_mapping(&out_irq);
+ }
++#else
++static unsigned int bcma_of_get_irq(struct platform_device *parent,
++				    struct bcma_device *core, int num)
++{
++	return 0;
++}
++#endif
+ 
+ static void bcma_of_fill_device(struct platform_device *parent,
+ 				struct bcma_device *core)
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 12/19] patches: make iwlwifi use the old thermal APIs
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (10 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 11/19] patches: do not call of_irq_* functions on kernel < 3.13 in bcma Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-15 18:15   ` Johannes Berg
  2016-07-10 21:14 ` [PATCH 13/19] patches: remove usage of the head_frag member of skb Hauke Mehrtens
                   ` (7 subsequent siblings)
  19 siblings, 1 reply; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

The thermal API changed in the last kernel versions, make iwlwifi use
the correct interface for each kernel version.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0070-thermal/iwlwifi.patch             | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0070-thermal/iwlwifi.patch

diff --git a/patches/collateral-evolutions/network/0070-thermal/iwlwifi.patch b/patches/collateral-evolutions/network/0070-thermal/iwlwifi.patch
new file mode 100644
index 0000000..f736036
--- /dev/null
+++ b/patches/collateral-evolutions/network/0070-thermal/iwlwifi.patch
@@ -0,0 +1,58 @@
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+index f1f2825..05d0dd2 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+@@ -637,7 +637,11 @@ send:
+ }
+ 
+ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
++				  unsigned long *temperature)
++#else
+ 				  int *temperature)
++#endif
+ {
+ 	struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
+ 	int ret;
+@@ -662,7 +666,11 @@ out:
+ }
+ 
+ static int iwl_mvm_tzone_get_trip_temp(struct thermal_zone_device *device,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
++				       int trip, unsigned long *temp)
++#else
+ 				       int trip, int *temp)
++#endif
+ {
+ 	struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
+ 
+@@ -685,8 +693,13 @@ static int iwl_mvm_tzone_get_trip_type(s
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ static int iwl_mvm_tzone_set_trip_temp(struct thermal_zone_device *device,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
++				       int trip, unsigned long temp)
++#else
+ 				       int trip, int temp)
++#endif
+ {
+ 	struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
+ 	struct iwl_mvm_thermal_device *tzone;
+@@ -739,12 +752,15 @@ out:
+ 	mutex_unlock(&mvm->mutex);
+ 	return ret;
+ }
++#endif /* >= 3.6 */
+ 
+ static  struct thermal_zone_device_ops tzone_ops = {
+ 	.get_temp = iwl_mvm_tzone_get_temp,
+ 	.get_trip_temp = iwl_mvm_tzone_get_trip_temp,
+ 	.get_trip_type = iwl_mvm_tzone_get_trip_type,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ 	.set_trip_temp = iwl_mvm_tzone_set_trip_temp,
++#endif
+ };
+ 
+ /* make all trips writable */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 13/19] patches: remove usage of the head_frag member of skb
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (11 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 12/19] patches: make iwlwifi use the old thermal APIs Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 14/19] patch: add include for net/ipv6.h to igb_main.c Hauke Mehrtens
                   ` (6 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

In kernel < 3.5 the skb header can not be fragmented, because this
feature is not implemented, so assume that head_frag is false.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0071-skb-head_frag/wireless.patch            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0071-skb-head_frag/wireless.patch

diff --git a/patches/collateral-evolutions/network/0071-skb-head_frag/wireless.patch b/patches/collateral-evolutions/network/0071-skb-head_frag/wireless.patch
new file mode 100644
index 0000000..d05cf53
--- /dev/null
+++ b/patches/collateral-evolutions/network/0071-skb-head_frag/wireless.patch
@@ -0,0 +1,16 @@
+diff --git a/net/wireless/util.c b/net/wireless/util.c
+index 9f440a9..18ff313 100644
+--- a/net/wireless/util.c
++++ b/net/wireless/util.c
+@@ -746,7 +746,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
+ 	u8 *payload;
+ 	int offset = 0, remaining, err;
+ 	struct ethhdr eth;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
++	bool reuse_frag = 0;
++#else
+ 	bool reuse_frag = skb->head_frag && !skb_has_frag_list(skb);
++#endif
+ 	bool reuse_skb = false;
+ 	bool last = false;
+ 
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 14/19] patch: add include for net/ipv6.h to igb_main.c
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (12 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 13/19] patches: remove usage of the head_frag member of skb Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 15/19] backports: add rhashtable_walk_init() Hauke Mehrtens
                   ` (5 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

Without this patch igb was unable to find ipv6_find_hdr() in kernel < 3.14.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0013-fix-makefile-includes/igb.patch             | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/igb.patch

diff --git a/patches/collateral-evolutions/network/0013-fix-makefile-includes/igb.patch b/patches/collateral-evolutions/network/0013-fix-makefile-includes/igb.patch
new file mode 100644
index 0000000..a0804dc
--- /dev/null
+++ b/patches/collateral-evolutions/network/0013-fix-makefile-includes/igb.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
+index 55a1405c..1409e20 100644
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -34,6 +34,7 @@
+ #include <linux/slab.h>
+ #include <net/checksum.h>
+ #include <net/ip6_checksum.h>
++#include <net/ipv6.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/mii.h>
+ #include <linux/ethtool.h>
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 15/19] backports: add rhashtable_walk_init()
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (13 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 14/19] patch: add include for net/ipv6.h to igb_main.c Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 16/19] patches: refresh on next-20160324 Hauke Mehrtens
                   ` (4 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

Since commit 1068c678f "rhashtable: accept GFP flags in
rhashtable_walk_init" rhashtable_walk_init() takes an additional
parameter which is also used by the mac80211 code, so backport the
function. For kernel < 4.1 this is not needed, because we already ship
a recent version of rhashtable. Add rhashtable_walk_init() instead of
adding the complete rhashtable to same some space on recent kernel
versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/rhashtable.h | 12 ++++++
 backport/compat/Makefile                     |  1 +
 backport/compat/backport-4.7.c               | 62 ++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 backport/backport-include/linux/rhashtable.h
 create mode 100644 backport/compat/backport-4.7.c

diff --git a/backport/backport-include/linux/rhashtable.h b/backport/backport-include/linux/rhashtable.h
new file mode 100644
index 0000000..14534d9
--- /dev/null
+++ b/backport/backport-include/linux/rhashtable.h
@@ -0,0 +1,12 @@
+#ifndef __BACKPORT_LINUX_RHASHTABLE_H
+#define __BACKPORT_LINUX_RHASHTABLE_H
+#include_next <linux/rhashtable.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+#define rhashtable_walk_init LINUX_BACKPORT(rhashtable_walk_init)
+int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter,
+			 gfp_t gfp);
+#endif /* < 3.10 */
+
+#endif /* __BACKPORT_LINUX_RHASHTABLE_H */
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 7651f83..6013083 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -32,6 +32,7 @@ compat-$(CPTCFG_KERNEL_4_3) += backport-4.3.o
 compat-$(CPTCFG_KERNEL_4_4) += backport-4.4.o
 compat-$(CPTCFG_KERNEL_4_5) += backport-4.5.o
 compat-$(CPTCFG_KERNEL_4_6) += backport-4.6.o
+compat-$(CPTCFG_KERNEL_4_7) += backport-4.7.o
 
 compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
 compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
diff --git a/backport/compat/backport-4.7.c b/backport/compat/backport-4.7.c
new file mode 100644
index 0000000..04737b0
--- /dev/null
+++ b/backport/compat/backport-4.7.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright(c) 2016 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Backport functionality introduced in Linux 4.7.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/export.h>
+#include <linux/list.h>
+#include <linux/rcupdate.h>
+#include <linux/rhashtable.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+/**
+ * rhashtable_walk_init - Initialise an iterator
+ * @ht:		Table to walk over
+ * @iter:	Hash table Iterator
+ * @gfp:	GFP flags for allocations
+ *
+ * This function prepares a hash table walk.
+ *
+ * Note that if you restart a walk after rhashtable_walk_stop you
+ * may see the same object twice.  Also, you may miss objects if
+ * there are removals in between rhashtable_walk_stop and the next
+ * call to rhashtable_walk_start.
+ *
+ * For a completely stable walk you should construct your own data
+ * structure outside the hash table.
+ *
+ * This function may sleep so you must not call it from interrupt
+ * context or with spin locks held.
+ *
+ * You must call rhashtable_walk_exit if this function returns
+ * successfully.
+ */
+int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter,
+			 gfp_t gfp)
+{
+	iter->ht = ht;
+	iter->p = NULL;
+	iter->slot = 0;
+	iter->skip = 0;
+
+	iter->walker = kmalloc(sizeof(*iter->walker), gfp);
+	if (!iter->walker)
+		return -ENOMEM;
+
+	spin_lock(&ht->lock);
+	iter->walker->tbl =
+		rcu_dereference_protected(ht->tbl, lockdep_is_held(&ht->lock));
+	list_add(&iter->walker->list, &iter->walker->tbl->walkers);
+	spin_unlock(&ht->lock);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rhashtable_walk_init);
+#endif /* >= 4.1 */
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 16/19] patches: refresh on next-20160324
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (14 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 15/19] backports: add rhashtable_walk_init() Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 17/19] gentree.py: print some more error messages when spatch fails Hauke Mehrtens
                   ` (3 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

1   3.0.101             [  OK  ]
2   3.1.10              [  OK  ]
3   3.2.81              [  OK  ]
4   3.3.8               [  OK  ]
5   3.4.112             [  OK  ]
6   3.5.7               [  OK  ]
7   3.6.11              [  OK  ]
8   3.7.10              [  OK  ]
9   3.8.13              [  OK  ]
10  3.9.11              [  OK  ]
11  3.10.102            [  OK  ]
12  3.11.10             [  OK  ]
13  3.12.61             [  OK  ]
14  3.13.11             [  OK  ]
15  3.14.73             [  OK  ]
16  3.15.10             [  OK  ]
17  3.16.36             [  OK  ]
18  3.17.8              [  OK  ]
19  3.18.36             [  OK  ]
20  3.19.8              [  OK  ]
21  4.0.9               [  OK  ]
22  4.1.27              [  OK  ]
23  4.2.8               [  OK  ]
24  4.3.6               [  OK  ]
25  4.4.14              [  OK  ]
26  4.5.7               [  OK  ]

Manual changes done to:
patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../media/0004-missing-include/media-device.patch  |  2 +-
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 ++--
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0025-usb-sg/usbnet.patch               |  2 +-
 .../0032-sriov_configure/igb_sriov_configure.patch |  4 ++--
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 23 ++++++++++++++--------
 .../0043-ndo_set_vf_rate/igb_set_vf_rate.patch     |  4 ++--
 .../network/0052-deactivate-ptp-pin/igb.patch      | 16 +++++++--------
 .../network/0053-possible_net_t.patch              |  2 +-
 .../0053-remove_wait_on_bit_timeout/btusb.patch    | 12 +++++------
 .../network/0055-name_assign_type/brcmfmac.patch   |  2 +-
 .../network/0062-acpi-gpio-remove/hci_bcm.patch    |  2 +-
 .../network/0072-netdevice-ndo_fdb_add/igb.patch   |  2 +-
 16 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/patches/collateral-evolutions/media/0004-missing-include/media-device.patch b/patches/collateral-evolutions/media/0004-missing-include/media-device.patch
index 9e0128a..01fbe79 100644
--- a/patches/collateral-evolutions/media/0004-missing-include/media-device.patch
+++ b/patches/collateral-evolutions/media/0004-missing-include/media-device.patch
@@ -7,6 +7,6 @@ index d385589..6d9a84d 100644
  #define _MEDIA_DEVICE_H
  
 +#include <linux/idr.h>
+ #include <linux/kref.h>
  #include <linux/list.h>
  #include <linux/mutex.h>
- #include <linux/spinlock.h>
diff --git a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch
index c5332f5..64e4f91 100644
--- a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch
@@ -28,7 +28,7 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1817,6 +1817,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1846,6 +1846,7 @@ static int nl80211_dump_wiphy(struct sk_
  						 cb->nlh->nlmsg_seq,
  						 NLM_F_MULTI, state);
  			if (ret < 0) {
@@ -36,7 +36,7 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
  				/*
  				 * If sending the wiphy data didn't fit (ENOBUFS
  				 * or EMSGSIZE returned), this SKB is still
-@@ -1838,6 +1839,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1867,6 +1868,7 @@ static int nl80211_dump_wiphy(struct sk_
  					rtnl_unlock();
  					return 1;
  				}
diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
index 959ad9e..78ef3d6 100644
--- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -3188,6 +3188,9 @@ struct wiphy_vendor_command {
+@@ -3222,6 +3222,9 @@ struct wiphy_vendor_command {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
diff --git a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index ccc1fab..437775c 100644
--- a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -11,7 +11,7 @@
  	device_initialize(&rdev->wiphy.dev);
  	rdev->wiphy.dev.class = &ieee80211_class;
  	rdev->wiphy.dev.platform_data = rdev;
-@@ -1036,6 +1032,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1043,6 +1039,15 @@ static int cfg80211_netdev_notifier_call
  		}
  		wdev->netdev = dev;
  #ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
index 362c26c..d51f911 100644
--- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -6853,7 +6853,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6955,7 +6955,9 @@ static int nl80211_dump_scan(struct sk_b
  	spin_lock_bh(&rdev->bss_lock);
  	cfg80211_bss_expire(rdev);
  
diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
index e7b9b84..46b919b 100644
--- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
+++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -1252,6 +1252,7 @@ struct ieee80211_local {
+@@ -1255,6 +1255,7 @@ struct ieee80211_local {
  	struct mutex chanctx_mtx;
  
  #ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
index bcc5e95..e9c204d 100644
--- a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
+++ b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
@@ -61,7 +61,7 @@
  		case rx_cleanup:
  			usb_free_urb (entry->urb);
  			dev_kfree_skb (skb);
-@@ -1833,7 +1851,9 @@ int usbnet_resume (struct usb_interface
+@@ -1840,7 +1858,9 @@ int usbnet_resume (struct usb_interface
  			retval = usb_submit_urb(res, GFP_ATOMIC);
  			if (retval < 0) {
  				dev_kfree_skb_any(skb);
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
index 57b2fe1..2167b7c 100644
--- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -7543,6 +7543,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7682,6 +7682,7 @@ static int igb_sriov_reinit(struct pci_d
  	return 0;
  }
  
@@ -8,7 +8,7 @@
  static int igb_pci_disable_sriov(struct pci_dev *dev)
  {
  	int err = igb_disable_sriov(dev);
-@@ -7552,6 +7553,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7691,6 +7692,7 @@ static int igb_pci_disable_sriov(struct
  
  	return err;
  }
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
index 3e1483e..5d174c2 100644
--- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
+++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -157,8 +157,16 @@ static void igb_tx_timeout(struct net_de
+@@ -158,8 +158,16 @@ static void igb_tx_timeout(struct net_de
  static void igb_reset_task(struct work_struct *);
  static void igb_vlan_mode(struct net_device *netdev,
  			  netdev_features_t features);
@@ -17,8 +17,8 @@
  static void igb_restore_vlan(struct igb_adapter *);
  static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
  static void igb_ping_all_vfs(struct igb_adapter *);
-@@ -7205,8 +7213,14 @@ static void igb_vlan_mode(struct net_dev
- 	igb_rlpml_set(adapter);
+@@ -7349,8 +7357,14 @@ static void igb_vlan_mode(struct net_dev
+ 	igb_set_vf_vlan_strip(adapter, adapter->vfs_allocated_count, enable);
  }
  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
@@ -32,7 +32,7 @@
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7220,11 +7234,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7362,11 +7376,19 @@ static int igb_vlan_rx_add_vid(struct ne
  
  	set_bit(vid, adapter->active_vlans);
  
@@ -51,8 +51,8 @@
 +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
- 	struct e1000_hw *hw = &adapter->hw;
-@@ -7240,7 +7262,9 @@ static int igb_vlan_rx_kill_vid(struct n
+ 	int pf_id = adapter->vfs_allocated_count;
+@@ -7378,7 +7400,9 @@ static int igb_vlan_rx_kill_vid(struct n
  
  	clear_bit(vid, adapter->active_vlans);
  
@@ -62,10 +62,17 @@
  }
  
  static void igb_restore_vlan(struct igb_adapter *adapter)
-@@ -7250,7 +7274,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7386,10 +7410,18 @@ static void igb_restore_vlan(struct igb_
+ 	u16 vid = 1;
+ 
  	igb_vlan_mode(adapter->netdev, adapter->netdev->features);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+ 	igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);
++#else
++	igb_vlan_rx_add_vid(adapter->netdev, 0);
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */
  
- 	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+ 	for_each_set_bit_from(vid, adapter->active_vlans, VLAN_N_VID)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
  		igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
 +#else
diff --git a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb_set_vf_rate.patch b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb_set_vf_rate.patch
index b0f4df0..6dea4e1 100644
--- a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb_set_vf_rate.patch
+++ b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb_set_vf_rate.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -7871,6 +7871,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -8013,6 +8013,7 @@ static int igb_ndo_set_vf_bw(struct net_
  	if (hw->mac.type != e1000_82576)
  		return -EOPNOTSUPP;
  
@@ -8,7 +8,7 @@
  	if (min_tx_rate)
  		return -EINVAL;
  
-@@ -7884,7 +7885,17 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -8026,7 +8027,17 @@ static int igb_ndo_set_vf_bw(struct net_
  	adapter->vf_rate_link_speed = actual_link_speed;
  	adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
  	igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
diff --git a/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch b/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch
index c0812a0..4e09f6f 100644
--- a/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch
+++ b/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb.h
 +++ b/drivers/net/ethernet/intel/igb/igb.h
-@@ -444,7 +444,9 @@ struct igb_adapter {
+@@ -443,7 +443,9 @@ struct igb_adapter {
  	u32 tx_hwtstamp_timeouts;
  	u32 rx_hwtstamp_cleared;
  
@@ -68,7 +68,7 @@
  static int igb_ptp_settime_i210(struct ptp_clock_info *ptp,
  				const struct timespec64 *ts)
  {
-@@ -597,6 +604,7 @@ static int igb_ptp_feature_enable_i210(s
+@@ -598,6 +605,7 @@ static int igb_ptp_feature_enable_i210(s
  
  	return -EOPNOTSUPP;
  }
@@ -76,7 +76,7 @@
  
  static int igb_ptp_feature_enable(struct ptp_clock_info *ptp,
  				  struct ptp_clock_request *rq, int on)
-@@ -604,6 +612,7 @@ static int igb_ptp_feature_enable(struct
+@@ -605,6 +613,7 @@ static int igb_ptp_feature_enable(struct
  	return -EOPNOTSUPP;
  }
  
@@ -84,7 +84,7 @@
  static int igb_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin,
  			      enum ptp_pin_function func, unsigned int chan)
  {
-@@ -617,6 +626,7 @@ static int igb_ptp_verify_pin(struct ptp
+@@ -618,6 +627,7 @@ static int igb_ptp_verify_pin(struct ptp
  	}
  	return 0;
  }
@@ -92,7 +92,7 @@
  
  /**
   * igb_ptp_tx_work
-@@ -1009,7 +1019,9 @@ void igb_ptp_init(struct igb_adapter *ad
+@@ -1010,7 +1020,9 @@ void igb_ptp_init(struct igb_adapter *ad
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct net_device *netdev = adapter->netdev;
@@ -102,7 +102,7 @@
  
  	switch (hw->mac.type) {
  	case e1000_82576:
-@@ -1050,6 +1062,7 @@ void igb_ptp_init(struct igb_adapter *ad
+@@ -1051,6 +1063,7 @@ void igb_ptp_init(struct igb_adapter *ad
  		/* Enable the timer functions by clearing bit 31. */
  		wr32(E1000_TSAUXC, 0x0);
  		break;
@@ -110,7 +110,7 @@
  	case e1000_i210:
  	case e1000_i211:
  		for (i = 0; i < IGB_N_SDP; i++) {
-@@ -1076,6 +1089,7 @@ void igb_ptp_init(struct igb_adapter *ad
+@@ -1077,6 +1090,7 @@ void igb_ptp_init(struct igb_adapter *ad
  		/* Enable the timer functions by clearing bit 31. */
  		wr32(E1000_TSAUXC, 0x0);
  		break;
@@ -118,7 +118,7 @@
  	default:
  		adapter->ptp_clock = NULL;
  		return;
-@@ -1087,11 +1101,14 @@ void igb_ptp_init(struct igb_adapter *ad
+@@ -1088,11 +1102,14 @@ void igb_ptp_init(struct igb_adapter *ad
  	INIT_WORK(&adapter->ptp_tx_work, igb_ptp_tx_work);
  
  	/* Initialize the clock and overflow work for devices that need it. */
diff --git a/patches/collateral-evolutions/network/0053-possible_net_t.patch b/patches/collateral-evolutions/network/0053-possible_net_t.patch
index f70dd80..12a7a51 100644
--- a/patches/collateral-evolutions/network/0053-possible_net_t.patch
+++ b/patches/collateral-evolutions/network/0053-possible_net_t.patch
@@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
 index 04e5785..a251da1 100644
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -3314,12 +3314,12 @@ struct wiphy {
+@@ -3350,12 +3350,12 @@ struct wiphy {
  
  static inline struct net *wiphy_net(struct wiphy *wiphy)
  {
diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
index 97f24fb..3c4e87b 100644
--- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
+++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1841,8 +1841,12 @@ static void btusb_intel_bootup(struct bt
+@@ -1845,8 +1845,12 @@ static void btusb_intel_bootup(struct bt
  		return;
  
  	if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) {
@@ -13,7 +13,7 @@
  	}
  }
  
-@@ -1859,8 +1863,12 @@ static void btusb_intel_secure_send_resu
+@@ -1863,8 +1867,12 @@ static void btusb_intel_secure_send_resu
  
  	if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) &&
  	    test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) {
@@ -26,7 +26,7 @@
  	}
  }
  
-@@ -2204,6 +2212,7 @@ static int btusb_setup_intel_new(struct
+@@ -2208,6 +2216,7 @@ static int btusb_setup_intel_new(struct
  	 * and thus just timeout if that happens and fail the setup
  	 * of this device.
  	 */
@@ -34,7 +34,7 @@
  	err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING,
  				  TASK_INTERRUPTIBLE,
  				  msecs_to_jiffies(5000));
-@@ -2218,6 +2227,31 @@ static int btusb_setup_intel_new(struct
+@@ -2222,6 +2231,31 @@ static int btusb_setup_intel_new(struct
  		err = -ETIMEDOUT;
  		goto done;
  	}
@@ -66,7 +66,7 @@
  
  	if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) {
  		BT_ERR("%s: Firmware loading failed", hdev->name);
-@@ -2257,6 +2291,7 @@ done:
+@@ -2261,6 +2295,7 @@ done:
  	 */
  	BT_INFO("%s: Waiting for device to boot", hdev->name);
  
@@ -74,7 +74,7 @@
  	err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING,
  				  TASK_INTERRUPTIBLE,
  				  msecs_to_jiffies(1000));
-@@ -2270,6 +2305,33 @@ done:
+@@ -2274,6 +2309,33 @@ done:
  		BT_ERR("%s: Device boot timeout", hdev->name);
  		return -ETIMEDOUT;
  	}
diff --git a/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch b/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch
index b8213bc..9915786 100644
--- a/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch
+++ b/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2198,7 +2198,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
+@@ -2208,7 +2208,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
  	}
  
  	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
diff --git a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
index 7df646f..db98d4b 100644
--- a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
+++ b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
@@ -66,7 +66,7 @@
  static const struct acpi_device_id bcm_acpi_match[] = {
  	{ "BCM2E1A", 0 },
  	{ "BCM2E39", 0 },
-@@ -840,7 +848,9 @@ static struct platform_driver bcm_driver
+@@ -843,7 +851,9 @@ static struct platform_driver bcm_driver
  	.remove = bcm_remove,
  	.driver = {
  		.name = "hci_bcm",
diff --git a/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
index c50fe51..429e676 100644
--- a/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
+++ b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
@@ -2,7 +2,7 @@ diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/in
 index 55a1405c..31edad7 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -2077,7 +2077,11 @@ static int igb_set_features(struct net_d
+@@ -2078,7 +2078,11 @@ static int igb_set_features(struct net_d
  
  static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
  			   struct net_device *dev,
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 17/19] gentree.py: print some more error messages when spatch fails.
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (15 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 16/19] patches: refresh on next-20160324 Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 18/19] devel: update test kernel versions Hauke Mehrtens
                   ` (2 subsequent siblings)
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

I saw some problems here, add more debug output.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentree.py b/gentree.py
index 772095f..e97ead0 100755
--- a/gentree.py
+++ b/gentree.py
@@ -601,7 +601,7 @@ def apply_patches(args, desc, source_dir, patch_src, target_dir, logwrite=lambda
         output = sprocess.communicate()[0]
         sprocess.wait()
         if sprocess.returncode != 0:
-            logwrite("Failed to process SmPL patch %s" % print_name)
+            logwrite("Failed to process SmPL patch %s with %i" % (print_name, sprocess.returncode))
             raise Exception('SmPL patch failed')
         output = output.split('\n')
         if output[-1] == '':
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 18/19] devel: update test kernel versions
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (16 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 17/19] gentree.py: print some more error messages when spatch fails Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-10 21:14 ` [PATCH 19/19] defconfig: update defconfigs, some options changed in the kernel Hauke Mehrtens
  2016-07-15 18:34 ` [PATCH 00/19] backports: bring to next-20160324 Johannes Berg
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 devel/backports-update-manager | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/devel/backports-update-manager b/devel/backports-update-manager
index 6dff50d..f7d693e 100755
--- a/devel/backports-update-manager
+++ b/devel/backports-update-manager
@@ -26,7 +26,7 @@ SPACE_PER_KERNEL_DEB=13
 KERNEL_URLS = [
     KPATH + "v3.0.101-oneiric/linux-headers-3.0.101-0300101_3.0.101-0300101.201310220446_all.deb",
     KPATH + "v3.1.10-precise/linux-headers-3.1.10-030110_3.1.10-030110.201201181135_all.deb",
-    KPATH + "v3.2.79-precise/linux-headers-3.2.79-030279_3.2.79-030279.201604010037_all.deb",
+    KPATH + "v3.2.81-precise/linux-headers-3.2.81-030281_3.2.81-030281.201606152334_all.deb",
     KPATH + "v3.3.8-quantal/linux-headers-3.3.8-030308_3.3.8-030308.201206041356_all.deb",
     KPATH + "v3.4.112-precise/linux-headers-3.4.112-0304112_3.4.112-0304112.201604271231_all.deb",
     KPATH + "v3.5.7.12-quantal/linux-headers-3.5.7-03050712_3.5.7-03050712.201305111435_all.deb",
@@ -34,23 +34,24 @@ KERNEL_URLS = [
     KPATH + "v3.7.10-raring/linux-headers-3.7.10-030710_3.7.10-030710.201302271235_all.deb",
     KPATH + "v3.8.13-raring/linux-headers-3.8.13-030813_3.8.13-030813.201305111843_all.deb",
     KPATH + "v3.9.11-saucy/linux-headers-3.9.11-030911_3.9.11-030911.201307202035_all.deb",
-    KPATH + "v3.10.101-precise/linux-headers-3.10.101-0310101_3.10.101-0310101.201603161244_all.deb",
+    KPATH + "v3.10.102-precise/linux-headers-3.10.102-0310102_3.10.102-0310102.201606131145_all.deb",
     KPATH + "v3.11.10-saucy/linux-headers-3.11.10-031110_3.11.10-031110.201311291453_all.deb",
-    KPATH + "v3.12.59-trusty/linux-headers-3.12.59-031259_3.12.59-031259.201604271336_all.deb",
+    KPATH + "v3.12.61-trusty/linux-headers-3.12.61-031261_3.12.61-031261.201606201232_all.deb",
     KPATH + "v3.13.11-trusty/linux-headers-3.13.11-031311_3.13.11-031311.201404222035_all.deb",
-    KPATH + "v3.14.67-trusty/linux-headers-3.14.67-031467_3.14.67-031467.201604200427_all.deb",
+    KPATH + "v3.14.73-trusty/linux-headers-3.14.73-031473_3.14.73-031473.201606241434_all.deb",
     KPATH + "v3.15.10-utopic/linux-headers-3.15.10-031510_3.15.10-031510.201408132333_all.deb",
-    KPATH + "v3.16.7-utopic/linux-headers-3.16.7-031607_3.16.7-031607.201410301735_all.deb",
+    KPATH + "v3.16.36-trusty/linux-headers-3.16.36-031636_3.16.36-031636.201606152333_all.deb",
     KPATH + "v3.17.8-vivid/linux-headers-3.17.8-031708_3.17.8-031708.201501081837_all.deb",
-    KPATH + "v3.18.32-vivid/linux-headers-3.18.32-031832_3.18.32-031832.201604271335_all.deb",
+    KPATH + "v3.18.36-vivid/linux-headers-3.18.36-031836_3.18.36-031836.201606230133_all.deb",
     KPATH + "v3.19.8-vivid/linux-headers-3.19.8-031908_3.19.8-031908.201505110938_all.deb",
     KPATH + "v4.0.9-wily/linux-headers-4.0.9-040009_4.0.9-040009.201507212131_all.deb",
-    KPATH + "v4.1.23-wily/linux-headers-4.1.23-040123_4.1.23-040123.201604281334_all.deb",
+    KPATH + "v4.1.27-wily/linux-headers-4.1.27-040127_4.1.27-040127.201606230134_all.deb",
     KPATH + "v4.2.8-wily/linux-headers-4.2.8-040208_4.2.8-040208.201512150620_all.deb",
     KPATH + "v4.3.6-wily/linux-headers-4.3.6-040306_4.3.6-040306.201602191831_all.deb",
-    KPATH + "v4.4.8-wily/linux-headers-4.4.8-040408_4.4.8-040408.201604200335_all.deb",
-    KPATH + "v4.5.2-wily/linux-headers-4.5.2-040502_4.5.2-040502.201604200335_all.deb",
-    KPATH + "v4.6-rc5-wily/linux-headers-4.6.0-040600rc5_4.6.0-040600rc5.201604242031_all.deb"
+    KPATH + "v4.4.14-xenial/linux-headers-4.4.14-040414_4.4.14-040414.201606241434_all.deb",
+    KPATH + "v4.5.7-yakkety/linux-headers-4.5.7-040507_4.5.7-040507.201606100436_all.deb",
+    KPATH + "v4.6.3-yakkety/linux-headers-4.6.3-040603_4.6.3-040603.201606241434_all.deb",
+    KPATH + "v4.7-rc6-yakkety/linux-headers-4.7.0-040700rc6_4.7.0-040700rc6.201607040332_all.deb"
 ]
 
 NUM_KERNELS=len(KERNEL_URLS)
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 19/19] defconfig: update defconfigs, some options changed in the kernel.
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (17 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 18/19] devel: update test kernel versions Hauke Mehrtens
@ 2016-07-10 21:14 ` Hauke Mehrtens
  2016-07-15 18:34 ` [PATCH 00/19] backports: bring to next-20160324 Johannes Berg
  19 siblings, 0 replies; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-10 21:14 UTC (permalink / raw)
  To: backports; +Cc: Hauke Mehrtens

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/defconfigs/ar5523      |  2 +-
 backport/defconfigs/ath10k      |  2 +-
 backport/defconfigs/ath5k       |  2 +-
 backport/defconfigs/ath6kl      |  2 +-
 backport/defconfigs/ath9k       |  2 +-
 backport/defconfigs/ath9k-debug |  2 +-
 backport/defconfigs/carl9170    |  2 +-
 backport/defconfigs/media       |  5 -----
 backport/defconfigs/wcn36xx     |  2 +-
 backport/defconfigs/wifi        | 18 +++++++++++++++---
 backport/defconfigs/wil6210     |  2 +-
 11 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/backport/defconfigs/ar5523 b/backport/defconfigs/ar5523
index b218d9a..101c3a2 100644
--- a/backport/defconfigs/ar5523
+++ b/backport/defconfigs/ar5523
@@ -4,5 +4,5 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_AR5523=m
diff --git a/backport/defconfigs/ath10k b/backport/defconfigs/ath10k
index c791c99..b7be617 100644
--- a/backport/defconfigs/ath10k
+++ b/backport/defconfigs/ath10k
@@ -4,7 +4,7 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH10K_PCI=m
 CPTCFG_ATH10K=m
 CPTCFG_ATH10K_DEBUG=y
diff --git a/backport/defconfigs/ath5k b/backport/defconfigs/ath5k
index df95c57..920c6c6 100644
--- a/backport/defconfigs/ath5k
+++ b/backport/defconfigs/ath5k
@@ -4,5 +4,5 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH5K=m
diff --git a/backport/defconfigs/ath6kl b/backport/defconfigs/ath6kl
index a372127..a1a1fdd 100644
--- a/backport/defconfigs/ath6kl
+++ b/backport/defconfigs/ath6kl
@@ -1,7 +1,7 @@
 CPTCFG_CFG80211=m
 CPTCFG_CFG80211_WEXT=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH6KL=m
 CPTCFG_ATH6KL_SDIO=m
 CPTCFG_ATH6KL_USB=m
diff --git a/backport/defconfigs/ath9k b/backport/defconfigs/ath9k
index 0e935cc..c7097f9 100644
--- a/backport/defconfigs/ath9k
+++ b/backport/defconfigs/ath9k
@@ -4,6 +4,6 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH9K=m
 CPTCFG_ATH9K_HTC=m
diff --git a/backport/defconfigs/ath9k-debug b/backport/defconfigs/ath9k-debug
index b7baedd..d9cf94f 100644
--- a/backport/defconfigs/ath9k-debug
+++ b/backport/defconfigs/ath9k-debug
@@ -12,7 +12,7 @@ CPTCFG_MAC80211_HT_DEBUG=y
 CPTCFG_MAC80211_IBSS_DEBUG=y
 CPTCFG_MAC80211_PS_DEBUG=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH9K=m
 CPTCFG_ATH9K_HTC=m
 CPTCFG_ATH_DEBUG=y
diff --git a/backport/defconfigs/carl9170 b/backport/defconfigs/carl9170
index cc94e37..002e0f1 100644
--- a/backport/defconfigs/carl9170
+++ b/backport/defconfigs/carl9170
@@ -4,5 +4,5 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_CARL9170=m
diff --git a/backport/defconfigs/media b/backport/defconfigs/media
index c8f2e4d..a044583 100644
--- a/backport/defconfigs/media
+++ b/backport/defconfigs/media
@@ -404,12 +404,8 @@ CPTCFG_VIDEO_MT9P031=m
 CPTCFG_VIDEO_MT9T001=m
 CPTCFG_VIDEO_MT9V011=m
 CPTCFG_VIDEO_MT9V032=m
-CPTCFG_VIDEO_MX2=m
-CPTCFG_VIDEO_MX2_EMMAPRP=m
-CPTCFG_VIDEO_MX3=m
 CPTCFG_VIDEO_MXB=m
 CPTCFG_VIDEO_NOON010PC30=m
-CPTCFG_VIDEO_OMAP1=m
 CPTCFG_VIDEO_OMAP2_VOUT=m
 CPTCFG_VIDEO_OMAP3=m
 CPTCFG_VIDEO_OV7640=m
@@ -464,7 +460,6 @@ CPTCFG_VIDEO_TDA9840=m
 CPTCFG_VIDEO_TEA6415C=m
 CPTCFG_VIDEO_TEA6420=m
 CPTCFG_VIDEO_THS7303=m
-CPTCFG_VIDEO_TIMBERDALE=m
 CPTCFG_VIDEO_TLV320AIC23B=m
 CPTCFG_VIDEO_TM6000=m
 CPTCFG_VIDEO_TM6000_ALSA=m
diff --git a/backport/defconfigs/wcn36xx b/backport/defconfigs/wcn36xx
index 374eb11..a0ed809 100644
--- a/backport/defconfigs/wcn36xx
+++ b/backport/defconfigs/wcn36xx
@@ -8,6 +8,6 @@ CPTCFG_MAC80211=m
 CPTCFG_MAC80211_DEBUGFS=y
 CPTCFG_MAC80211_MESSAGE_TRACING=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_WCN36XX=m
 CPTCFG_WCN36XX_DEBUGFS=y
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 78d1453..4034bb1 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -11,7 +11,6 @@ CPTCFG_ATH6KL_SDIO=m
 CPTCFG_ATH6KL_USB=m
 CPTCFG_ATH9K_HTC=m
 CPTCFG_ATH9K=m
-CPTCFG_ATH_CARDS=m
 CPTCFG_ATMEL=m
 CPTCFG_B43LEGACY=m
 CPTCFG_B43=m
@@ -119,6 +118,19 @@ CPTCFG_WLAN=y
 CPTCFG_WLCORE=m
 CPTCFG_WLCORE_SDIO=m
 CPTCFG_WLCORE_SPI=m
-CPTCFG_WL_MEDIATEK=y
-CPTCFG_WL_TI=y
+CPTCFG_WLAN_VENDOR_ADMTEK=y
+CPTCFG_WLAN_VENDOR_ATH=y
+CPTCFG_WLAN_VENDOR_ATMEL=y
+CPTCFG_WLAN_VENDOR_BROADCOM=y
+CPTCFG_WLAN_VENDOR_CISCO=y
+CPTCFG_WLAN_VENDOR_INTEL=y
+CPTCFG_WLAN_VENDOR_INTERSIL=y
+CPTCFG_WLAN_VENDOR_MARVELL=y
+CPTCFG_WLAN_VENDOR_MEDIATEK=y
+CPTCFG_WLAN_VENDOR_RALINK=y
+CPTCFG_WLAN_VENDOR_REALTEK=y
+CPTCFG_WLAN_VENDOR_RSI=y
+CPTCFG_WLAN_VENDOR_ST=y
+CPTCFG_WLAN_VENDOR_TI=y
+CPTCFG_WLAN_VENDOR_ZYDAS=y
 CPTCFG_ZD1211RW=m
diff --git a/backport/defconfigs/wil6210 b/backport/defconfigs/wil6210
index 3fa29b8..e449a69 100644
--- a/backport/defconfigs/wil6210
+++ b/backport/defconfigs/wil6210
@@ -1,5 +1,5 @@
 CPTCFG_CFG80211=m
 CPTCFG_CFG80211_WEXT=y
 CPTCFG_WLAN=y
-CPTCFG_ATH_CARDS=m
+CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_WIL6210=m
-- 
2.8.1

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

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* Re: [PATCH 12/19] patches: make iwlwifi use the old thermal APIs
  2016-07-10 21:14 ` [PATCH 12/19] patches: make iwlwifi use the old thermal APIs Hauke Mehrtens
@ 2016-07-15 18:15   ` Johannes Berg
  2016-07-15 18:40     ` Johannes Berg
  0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2016-07-15 18:15 UTC (permalink / raw)
  To: Hauke Mehrtens, backports

On Sun, 2016-07-10 at 23:14 +0200, Hauke Mehrtens wrote:
> The thermal API changed in the last kernel versions, make iwlwifi use
> the correct interface for each kernel version.
> 
What's wrong with Luca's approach for this?

I really dislike having to touch the code, even if the amount of code
for the "proper" backport is possibly bigger.

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 00/19] backports: bring to next-20160324
  2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
                   ` (18 preceding siblings ...)
  2016-07-10 21:14 ` [PATCH 19/19] defconfig: update defconfigs, some options changed in the kernel Hauke Mehrtens
@ 2016-07-15 18:34 ` Johannes Berg
  2016-07-15 18:39   ` Hauke Mehrtens
  19 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2016-07-15 18:34 UTC (permalink / raw)
  To: Hauke Mehrtens, backports

On Sun, 2016-07-10 at 23:14 +0200, Hauke Mehrtens wrote:
> This add various stuff needed for next-20160324.
> 

Are you sure this was 2016 03 24?

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 00/19] backports: bring to next-20160324
  2016-07-15 18:34 ` [PATCH 00/19] backports: bring to next-20160324 Johannes Berg
@ 2016-07-15 18:39   ` Hauke Mehrtens
  2016-07-15 18:39     ` Johannes Berg
  0 siblings, 1 reply; 26+ messages in thread
From: Hauke Mehrtens @ 2016-07-15 18:39 UTC (permalink / raw)
  To: Johannes Berg, backports

Hi Johannes,

On 07/15/2016 08:34 PM, Johannes Berg wrote:
> On Sun, 2016-07-10 at 23:14 +0200, Hauke Mehrtens wrote:
>> This add various stuff needed for next-20160324.
>>
> 
> Are you sure this was 2016 03 24?

Yes this is for 2016 03 24.

Do you see a problem or why are you asking?

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 00/19] backports: bring to next-20160324
  2016-07-15 18:39   ` Hauke Mehrtens
@ 2016-07-15 18:39     ` Johannes Berg
  0 siblings, 0 replies; 26+ messages in thread
From: Johannes Berg @ 2016-07-15 18:39 UTC (permalink / raw)
  To: Hauke Mehrtens, backports

On Fri, 2016-07-15 at 20:39 +0200, Hauke Mehrtens wrote:
> Hi Johannes,
> 
> On 07/15/2016 08:34 PM, Johannes Berg wrote:
> > On Sun, 2016-07-10 at 23:14 +0200, Hauke Mehrtens wrote:
> > > This add various stuff needed for next-20160324.
> > > 
> > 
> > Are you sure this was 2016 03 24?
> 
> Yes this is for 2016 03 24.
> Do you see a problem or why are you asking?
> 

No, it just seemed so old :)

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 12/19] patches: make iwlwifi use the old thermal APIs
  2016-07-15 18:15   ` Johannes Berg
@ 2016-07-15 18:40     ` Johannes Berg
  2016-07-15 19:01       ` Johannes Berg
  0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2016-07-15 18:40 UTC (permalink / raw)
  To: Hauke Mehrtens, backports

On Fri, 2016-07-15 at 20:15 +0200, Johannes Berg wrote:
> On Sun, 2016-07-10 at 23:14 +0200, Hauke Mehrtens wrote:
> > The thermal API changed in the last kernel versions, make iwlwifi
> > use
> > the correct interface for each kernel version.
> > 
> What's wrong with Luca's approach for this?
> 
> I really dislike having to touch the code, even if the amount of code
> for the "proper" backport is possibly bigger.
> 

Oh, I see - Luca never sent it out ... I'll test it and do that.

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 12/19] patches: make iwlwifi use the old thermal APIs
  2016-07-15 18:40     ` Johannes Berg
@ 2016-07-15 19:01       ` Johannes Berg
  0 siblings, 0 replies; 26+ messages in thread
From: Johannes Berg @ 2016-07-15 19:01 UTC (permalink / raw)
  To: Hauke Mehrtens, backports

On Fri, 2016-07-15 at 20:40 +0200, Johannes Berg wrote:
> 
> Oh, I see - Luca never sent it out ... I'll test it and do that.
> 

Well, I can't make it pass compilation right now ... I'll send it out
anyway, as an RFC.

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

^ permalink raw reply	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2016-07-15 19:01 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-10 21:14 [PATCH 00/19] backports: bring to next-20160324 Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 01/19] copy-list: rename brcmfmac.h Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 02/19] copy-list: add media/tvp5150.h header file Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 03/19] dependencies: deactivate igb on kernel < 3.11 Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 04/19] header: adapt get_user_pages_{locked,unlocked} signature Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 05/19] header: remove vid parameter from ndo_dflt_fdb_add() Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 06/19] header: add ipv6_addr_prefix_copy() Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 07/19] header: add missing S16_MIN and S16_MAX Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 08/19] header: add empty for_each_child_of_node() Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 09/19] header: adapt thermal_zone_device_register() signature changes Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 10/19] header: add thermal_notify_framework() Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 11/19] patches: do not call of_irq_* functions on kernel < 3.13 in bcma Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 12/19] patches: make iwlwifi use the old thermal APIs Hauke Mehrtens
2016-07-15 18:15   ` Johannes Berg
2016-07-15 18:40     ` Johannes Berg
2016-07-15 19:01       ` Johannes Berg
2016-07-10 21:14 ` [PATCH 13/19] patches: remove usage of the head_frag member of skb Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 14/19] patch: add include for net/ipv6.h to igb_main.c Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 15/19] backports: add rhashtable_walk_init() Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 16/19] patches: refresh on next-20160324 Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 17/19] gentree.py: print some more error messages when spatch fails Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 18/19] devel: update test kernel versions Hauke Mehrtens
2016-07-10 21:14 ` [PATCH 19/19] defconfig: update defconfigs, some options changed in the kernel Hauke Mehrtens
2016-07-15 18:34 ` [PATCH 00/19] backports: bring to next-20160324 Johannes Berg
2016-07-15 18:39   ` Hauke Mehrtens
2016-07-15 18:39     ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).