[PATCH 00/10] backport: update to next-20151013

[PATCH 00/10] backport: update to next-20151013

[Hauke Mehrtens]

This brings backports in sync with next-20151013.
In addition it fixes some problem on RHEL 7.

Hauke Mehrtens (10):
  patches: argument removed from struct ipv6_stub->ndisc_send_na()
  patches: add missing header in 6lowpan/core.h
  header: adapt renaming of mei_cl_ to mei_cldev_
  header: add ktime_get_ns()
  header: add __GFP_KSWAPD_RECLAIM
  header: add nla_get_le32() and nla_get_le64()
  header: change check for ACPI_COMPANION
  backport: add of_property_read_u64_array()
  dependencies: VIDEO_MT9P031 uses gpio consumer
  patches: refresh on next-20151013

 backport/backport-include/linux/acpi.h             |  4 +--
 backport/backport-include/linux/gfp.h              | 13 ++++++++
 backport/backport-include/linux/mei_cl_bus.h       | 18 +++++++++--
 backport/backport-include/linux/of.h               | 17 ++++++++++
 backport/backport-include/linux/timekeeping.h      | 10 ++++++
 backport/backport-include/net/netlink.h            | 22 +++++++++++++
 backport/compat/backport-3.18.c                    | 37 ++++++++++++++++++++++
 dependencies                                       |  2 +-
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 +--
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../0013-fix-makefile-includes/6lowpan.patch       | 10 ++++++
 .../0013-fix-makefile-includes/brcmfmac.patch      | 10 ------
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../0020-tty-termios/net_bluetooth_hci_ldisc.patch | 10 +++---
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0025-usb-sg/usbnet.patch               |  2 +-
 .../network/0028-select_queue/mwifiex.patch        |  2 +-
 .../network/0030-qdisc_tx_busylock/bluetooth.patch |  4 +--
 .../0032-sriov_configure/igb_sriov_configure.patch |  4 +--
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch |  8 ++---
 .../0043-ndo_set_vf_rate/igb_set_vf_rate.patch     |  4 +--
 .../network/0047-write_iter/bluetooth.patch        | 10 +++---
 .../network/0050-iov_iter/bluetooth.patch          |  8 ++---
 .../network/0052-deactivate-ptp-pin/igb.patch      |  4 +--
 .../network/0053-possible_net_t.patch              |  2 +-
 .../0053-remove_wait_on_bit_timeout/btusb.patch    | 12 +++----
 .../hci_intel.patch                                | 10 +++---
 .../network/0055-name_assign_type/brcmfmac.patch   |  2 +-
 .../network/0059-uuid-in-mei/nfc.patch             | 16 ++++++----
 .../network/0062-acpi-gpio-remove/hci_bcm.patch    | 24 +++++++-------
 .../network/0062-acpi-gpio-remove/hci_intel.patch  | 10 +++---
 .../network/0065-ndisc_send_na-argument.cocci      |  9 ++++++
 33 files changed, 211 insertions(+), 85 deletions(-)
 create mode 100644 backport/backport-include/linux/gfp.h
 create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/6lowpan.patch
 delete mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
 create mode 100644 patches/collateral-evolutions/network/0065-ndisc_send_na-argument.cocci

-- 
2.6.2

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

[PATCH 01/10] patches: argument removed from struct ipv6_stub->ndisc_send_na()

[Hauke Mehrtens]

Commit 38cf595b1 "ipv6: remove unused neigh parameter from ndisc
functions" removed one parameter from the callback function
ndisc_send_na(). This semantic patch makes the code add NULL for that
parameter on older kernel versions. Null was passed in most of the
callers before.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0065-ndisc_send_na-argument.cocci                    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0065-ndisc_send_na-argument.cocci

diff --git a/patches/collateral-evolutions/network/0065-ndisc_send_na-argument.cocci b/patches/collateral-evolutions/network/0065-ndisc_send_na-argument.cocci
new file mode 100644
index 0000000..84c4209
--- /dev/null
+++ b/patches/collateral-evolutions/network/0065-ndisc_send_na-argument.cocci
@@ -0,0 +1,9 @@
+@@
+identifier ndisc_send_na;
+expression netdev, saddr, target, router, solicited, override, inc_opt;
+@@
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+ ipv6_stub->ndisc_send_na(netdev, saddr, target, router, solicited, override, inc_opt);
++#else
++ipv6_stub->ndisc_send_na(netdev, NULL, saddr, target, router, solicited, override, inc_opt);
++#endif
-- 
2.6.2

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

[PATCH 02/10] patches: add missing header in 6lowpan/core.h

[Hauke Mehrtens]

This include is missing in kernel version <= 3.5.

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

diff --git a/patches/collateral-evolutions/network/0013-fix-makefile-includes/6lowpan.patch b/patches/collateral-evolutions/network/0013-fix-makefile-includes/6lowpan.patch
new file mode 100644
index 0000000..b337bdb
--- /dev/null
+++ b/patches/collateral-evolutions/network/0013-fix-makefile-includes/6lowpan.patch
@@ -0,0 +1,10 @@
+--- a/net/6lowpan/core.c
++++ b/net/6lowpan/core.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ 
+ #include <net/6lowpan.h>
++#include <linux/if_arp.h>
+ 
+ void lowpan_netdev_setup(struct net_device *dev, enum lowpan_lltypes lltype)
+ {
-- 
2.6.2

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

[PATCH 03/10] header: adapt renaming of mei_cl_ to mei_cldev_

[Hauke Mehrtens]

Commit d49dc5e76 "mei: bus: use mei_cldev_ prefix for the API
functions" changed the prefix for these functions. On older kernel
versions they are still exported under their old name, name our code
use the old names on older kernel versions.

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

diff --git a/backport/backport-include/linux/mei_cl_bus.h b/backport/backport-include/linux/mei_cl_bus.h
index d7f0dfd..f406777 100644
--- a/backport/backport-include/linux/mei_cl_bus.h
+++ b/backport/backport-include/linux/mei_cl_bus.h
@@ -3,9 +3,23 @@
 #include_next <linux/mei_cl_bus.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0))
-#define mei_cl_register_event_cb(device, event_mask, read_cb, context) \
-	mei_cl_register_event_cb(device, read_cb, context)
+#define mei_cldev_register_event_cb(cldev, event_mask, read_cb, context) \
+	mei_cl_register_event_cb(cldev, read_cb, context)
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
+#define mei_cldev_register_event_cb(cldev, event_mask, read_cb, context) \
+	mei_cl_register_event_cb(cldev, event_mask, read_cb, context)
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
+#define __mei_cldev_driver_register(cldrv, owner) __mei_cl_driver_register(cldrv, owner)
+#define mei_cldev_driver_register(cldrv) mei_cl_driver_register(cldrv)
+#define mei_cldev_driver_unregister(cldrv) mei_cl_driver_unregister(cldrv)
+#define mei_cldev_send(cldev, buf, length) mei_cl_send(cldev, buf, length)
+#define mei_cldev_recv(cldev, buf, length) mei_cl_recv(cldev, buf, length)
+#define mei_cldev_get_drvdata(cldev) mei_cl_get_drvdata(cldev)
+#define mei_cldev_set_drvdata(cldev, data) mei_cl_set_drvdata(cldev, data)
+#define mei_cldev_enable(cldev) mei_cl_enable_device(cldev)
+#define mei_cldev_disable(cldev) mei_cl_disable_device(cldev)
+#endif
 
 #endif /* __BACKPORT_LINUX_MEI_CL_BUS_H */
-- 
2.6.2

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

[PATCH 04/10] header: add ktime_get_ns()

[Hauke Mehrtens]

We also have to add the prototype of ktime_t ktime_get(), because
including linux/hrtimer.h caused some strange build errors.

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

diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h
index 4fb39b2..fe42e71 100644
--- a/backport/backport-include/linux/timekeeping.h
+++ b/backport/backport-include/linux/timekeeping.h
@@ -7,6 +7,16 @@
 #include_next <linux/timekeeping.h>
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+#define ktime_get_ns LINUX_BACKPORT(ktime_get_ns)
+extern ktime_t ktime_get(void);
+#define ktime_get_ns LINUX_BACKPORT(ktime_get_ns)
+static inline u64 ktime_get_ns(void)
+{
+	return ktime_to_ns(ktime_get());
+}
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
 static inline time64_t ktime_get_seconds(void)
 {
-- 
2.6.2

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

[PATCH 05/10] header: add __GFP_KSWAPD_RECLAIM

[Hauke Mehrtens]

This was added to the mainline kernel in commit ac4f832eb2 "mm,
page_alloc: distinguish between being unable to sleep, unwilling to
sleep and avoiding waking kswapd". Instead of __GFP_KSWAPD_RECLAIM the
old mm code did not got any flag.

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

diff --git a/backport/backport-include/linux/gfp.h b/backport/backport-include/linux/gfp.h
new file mode 100644
index 0000000..b4db7bb
--- /dev/null
+++ b/backport/backport-include/linux/gfp.h
@@ -0,0 +1,13 @@
+#ifndef __BACKPORT_LINUX_GFP_H
+#define __BACKPORT_LINUX_GFP_H
+#include_next <linux/gfp.h>
+
+#ifndef ___GFP_KSWAPD_RECLAIM
+#define ___GFP_KSWAPD_RECLAIM	0x0u
+#endif
+
+#ifndef __GFP_KSWAPD_RECLAIM
+#define __GFP_KSWAPD_RECLAIM	((__force gfp_t)___GFP_KSWAPD_RECLAIM) /* kswapd can wake */
+#endif
+
+#endif /* __BACKPORT_TIMKEEPING_H */
-- 
2.6.2

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

[PATCH 06/10] header: add nla_get_le32() and nla_get_le64()

[Hauke Mehrtens]

These functions were added in commit c648a0138 "netlink: add nla_get
for le32 and le64"

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

diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h
index 35d9260..40160b5 100644
--- a/backport/backport-include/net/netlink.h
+++ b/backport/backport-include/net/netlink.h
@@ -167,4 +167,26 @@ static inline struct in6_addr nla_get_in6_addr(const struct nlattr *nla)
 }
 #endif /* < 4.1 */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
+/**
+ * nla_get_le32 - return payload of __le32 attribute
+ * @nla: __le32 netlink attribute
+ */
+#define nla_get_le32 LINUX_BACKPORT(nla_get_le32)
+static inline __le32 nla_get_le32(const struct nlattr *nla)
+{
+	return *(__le32 *) nla_data(nla);
+}
+
+/**
+ * nla_get_le64 - return payload of __le64 attribute
+ * @nla: __le64 netlink attribute
+ */
+#define nla_get_le64 LINUX_BACKPORT(nla_get_le64)
+static inline __le64 nla_get_le64(const struct nlattr *nla)
+{
+	return *(__le64 *) nla_data(nla);
+}
+#endif /* < 4.4 */
+
 #endif /* __BACKPORT_NET_NETLINK_H */
-- 
2.6.2

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

[PATCH 07/10] header: change check for ACPI_COMPANION

[Hauke Mehrtens]

Instead of using the kernel version to check if we have to add a
backport for ACPI_COMPANION check for it directly. RedHat 7 backported
this change to their kernel and writes a warning without this change.

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

diff --git a/backport/backport-include/linux/acpi.h b/backport/backport-include/linux/acpi.h
index 395ca18..4c63a26 100644
--- a/backport/backport-include/linux/acpi.h
+++ b/backport/backport-include/linux/acpi.h
@@ -36,7 +36,7 @@
 #endif /* CONFIG_ACPI */
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+#ifndef ACPI_COMPANION
 #ifdef CONFIG_ACPI
 static inline struct acpi_device *_acpi_get_companion(struct device *dev)
 {
@@ -53,7 +53,7 @@ static inline struct acpi_device *_acpi_get_companion(struct device *dev)
 #else
 #define ACPI_COMPANION(dev)	(NULL)
 #endif /* CONFIG_ACPI */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) */
+#endif /* ACPI_COMPANION */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
 #define acpi_dev_remove_driver_gpios LINUX_BACKPORT(acpi_dev_remove_driver_gpios)
-- 
2.6.2

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

[PATCH 08/10] backport: add of_property_read_u64_array()

[Hauke Mehrtens]

This function was added in commit b31384fa5 "Driver core: Unified
device properties interface for platform firmware".

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/of.h | 17 +++++++++++++++++
 backport/compat/backport-3.18.c      | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/backport/backport-include/linux/of.h b/backport/backport-include/linux/of.h
index ef9c6aa..bc0d7fd 100644
--- a/backport/backport-include/linux/of.h
+++ b/backport/backport-include/linux/of.h
@@ -167,4 +167,21 @@ static inline struct device_node *of_find_compatible_node(
 #endif
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
+#define of_property_read_u64_array LINUX_BACKPORT(of_property_read_u64_array)
+#ifdef CONFIG_OF
+extern int of_property_read_u64_array(const struct device_node *np,
+				      const char *propname,
+				      u64 *out_values,
+				      size_t sz);
+#else
+static inline int of_property_read_u64_array(const struct device_node *np,
+					     const char *propname,
+					     u64 *out_values, size_t sz)
+{
+	return -ENOSYS;
+}
+#endif /* CONFIG_OF */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) */
+
 #endif	/* _COMPAT_LINUX_OF_H */
diff --git a/backport/compat/backport-3.18.c b/backport/compat/backport-3.18.c
index 9e1a026..bed5d96 100644
--- a/backport/compat/backport-3.18.c
+++ b/backport/compat/backport-3.18.c
@@ -15,6 +15,7 @@
 #include <linux/skbuff.h>
 #include <linux/errqueue.h>
 #include <linux/wait.h>
+#include <linux/of.h>
 
 /**
  * eth_get_headlen - determine the the length of header for an ethernet frame
@@ -221,3 +222,39 @@ __sched int bit_wait_timeout(struct wait_bit_key *word)
 }
 EXPORT_SYMBOL_GPL(bit_wait_timeout);
 #endif
+
+#ifdef CONFIG_OF
+/**
+ * of_property_read_u64_array - Find and read an array of 64 bit integers
+ * from a property.
+ *
+ * @np:		device node from which the property value is to be read.
+ * @propname:	name of the property to be searched.
+ * @out_values:	pointer to return value, modified only if return value is 0.
+ * @sz:		number of array elements to read
+ *
+ * Search for a property in a device node and read 64-bit value(s) from
+ * it. Returns 0 on success, -EINVAL if the property does not exist,
+ * -ENODATA if property does not have a value, and -EOVERFLOW if the
+ * property data isn't large enough.
+ *
+ * The out_values is modified only if a valid u64 value can be decoded.
+ */
+int of_property_read_u64_array(const struct device_node *np,
+			       const char *propname, u64 *out_values,
+			       size_t sz)
+{
+	const __be32 *val = of_find_property_value_of_size(np, propname,
+						(sz * sizeof(*out_values)));
+
+	if (IS_ERR(val))
+		return PTR_ERR(val);
+
+	while (sz--) {
+		*out_values++ = of_read_number(val, 2);
+		val += 2;
+	}
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_property_read_u64_array);
+#endif /* CONFIG_OF */
-- 
2.6.2

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

[PATCH 09/10] dependencies: VIDEO_MT9P031 uses gpio consumer

[Hauke Mehrtens]

VIDEO_MT9P031 uses the GPIO consumer and should only be build on
kernel version >= 3.13

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

diff --git a/dependencies b/dependencies
index 96f1d0a..ad3ec31 100644
--- a/dependencies
+++ b/dependencies
@@ -58,6 +58,7 @@ DVB_SMIPCIE 3.8
 # start that work with.
 VIDEO_ADP1653 3.13
 VIDEO_TC358743 3.13
+VIDEO_MT9P031 3.13
 
 # missing devm_gpiod_get_optional()
 # this needs devm_gpiod_get_optional() with 3 arguments.
@@ -79,7 +80,6 @@ VIDEO_S5K6AA 3.3
 # missing devm_regulator_bulk_get
 VIDEO_MT9T001 3.5
 VIDEO_NOON010PC30 3.5
-VIDEO_MT9P031 3.5
 
 # missing of_property_read_bool() added via fa4d34cc on v3.4-rc1~71, backport
 # that attomically and you can enable this for older kernels.
-- 
2.6.2

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

[PATCH 10/10] patches: refresh on next-20151013

[Hauke Mehrtens]

1   3.0.101             [  OK  ]
2   3.1.10              [  OK  ]
3   3.2.72              [  OK  ]
4   3.3.8               [  OK  ]
5   3.4.110             [  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.92             [  OK  ]
12  3.11.10             [  OK  ]
13  3.12.49             [  OK  ]
14  3.13.11             [  OK  ]
15  3.14.56             [  OK  ]
16  3.15.10             [  OK  ]
17  3.16.7              [  OK  ]
18  3.17.8              [  OK  ]
19  3.18.23             [  OK  ]
20  3.19.8              [  OK  ]
21  4.0.9               [  OK  ]
22  4.1.12              [  OK  ]
23  4.2.5               [  OK  ]
24  4.3-rc7             [  OK  ]

manual changes done to the following patches:
 * patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
 * patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
 * patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 ++--
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../0013-fix-makefile-includes/brcmfmac.patch      | 10 ---------
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../0020-tty-termios/net_bluetooth_hci_ldisc.patch | 10 ++++-----
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0025-usb-sg/usbnet.patch               |  2 +-
 .../network/0028-select_queue/mwifiex.patch        |  2 +-
 .../network/0030-qdisc_tx_busylock/bluetooth.patch |  4 ++--
 .../0032-sriov_configure/igb_sriov_configure.patch |  4 ++--
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch |  8 ++++----
 .../0043-ndo_set_vf_rate/igb_set_vf_rate.patch     |  4 ++--
 .../network/0047-write_iter/bluetooth.patch        | 10 ++++-----
 .../network/0050-iov_iter/bluetooth.patch          |  8 ++++----
 .../network/0052-deactivate-ptp-pin/igb.patch      |  4 ++--
 .../network/0053-possible_net_t.patch              |  2 +-
 .../0053-remove_wait_on_bit_timeout/btusb.patch    | 12 +++++------
 .../hci_intel.patch                                | 10 ++++-----
 .../network/0055-name_assign_type/brcmfmac.patch   |  2 +-
 .../network/0059-uuid-in-mei/nfc.patch             | 16 +++++++++------
 .../network/0062-acpi-gpio-remove/hci_bcm.patch    | 24 +++++++++++-----------
 .../network/0062-acpi-gpio-remove/hci_intel.patch  | 10 ++++-----
 23 files changed, 74 insertions(+), 80 deletions(-)
 delete mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch

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 933f847..7c901a1 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
-@@ -1803,6 +1803,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1804,6 +1804,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
-@@ -1824,6 +1825,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1825,6 +1826,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 edc4dc4..66d2fae 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
-@@ -3119,6 +3119,9 @@ struct wiphy_vendor_command {
+@@ -3131,6 +3131,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 733d16b..e40ff18 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;
-@@ -1022,6 +1018,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1023,6 +1019,15 @@ static int cfg80211_netdev_notifier_call
  		}
  		wdev->netdev = dev;
  #ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch b/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
deleted file mode 100644
index 0e0a96c..0000000
--- a/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
-@@ -15,6 +15,7 @@
-  */
- 
- #include <linux/types.h>
-+#include <linux/atomic.h>
- #include <linux/kernel.h>
- #include <linux/kthread.h>
- #include <linux/printk.h>
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 88a0553..e06d0bf 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
-@@ -6652,7 +6652,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6666,7 +6666,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/0020-tty-termios/net_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_hci_ldisc.patch
index eea918a..5434531 100644
--- a/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_hci_ldisc.patch
+++ b/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_hci_ldisc.patch
@@ -8,7 +8,7 @@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
-@@ -277,7 +278,11 @@ void hci_uart_set_flow_control(struct hc
+@@ -268,7 +269,11 @@ void hci_uart_set_flow_control(struct hc
  
  	if (enable) {
  		/* Disable hardware flow control */
@@ -20,7 +20,7 @@
  		ktermios.c_cflag &= ~CRTSCTS;
  		status = tty_set_termios(tty, &ktermios);
  		BT_DBG("Disabling hardware flow control: %s",
-@@ -311,7 +316,11 @@ void hci_uart_set_flow_control(struct hc
+@@ -302,7 +307,11 @@ void hci_uart_set_flow_control(struct hc
  		BT_DBG("Setting RTS: %s", status ? "failed" : "success");
  
  		/* Re-enable hardware flow control */
@@ -32,7 +32,7 @@
  		ktermios.c_cflag |= CRTSCTS;
  		status = tty_set_termios(tty, &ktermios);
  		BT_DBG("Enabling hardware flow control: %s",
-@@ -332,7 +341,11 @@ void hci_uart_init_tty(struct hci_uart *
+@@ -323,7 +332,11 @@ void hci_uart_init_tty(struct hci_uart *
  	struct ktermios ktermios;
  
  	/* Bring the UART into a known 8 bits no parity hw fc state */
@@ -44,7 +44,7 @@
  	ktermios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP |
  			      INLCR | IGNCR | ICRNL | IXON);
  	ktermios.c_oflag &= ~OPOST;
-@@ -350,7 +363,11 @@ void hci_uart_set_baudrate(struct hci_ua
+@@ -341,7 +354,11 @@ void hci_uart_set_baudrate(struct hci_ua
  	struct tty_struct *tty = hu->tty;
  	struct ktermios ktermios;
  
@@ -56,7 +56,7 @@
  	ktermios.c_cflag &= ~CBAUD;
  	tty_termios_encode_baud_rate(&ktermios, speed, speed);
  
-@@ -358,7 +375,7 @@ void hci_uart_set_baudrate(struct hci_ua
+@@ -349,7 +366,7 @@ void hci_uart_set_baudrate(struct hci_ua
  	tty_set_termios(tty, &ktermios);
  
  	BT_DBG("%s: New tty speeds: %d/%d", hu->hdev->name,
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 ea1c1f7..ee28845 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
-@@ -1256,6 +1256,7 @@ struct ieee80211_local {
+@@ -1250,6 +1250,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 13e09ea..4e5864b 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);
-@@ -1836,7 +1854,9 @@ int usbnet_resume (struct usb_interface
+@@ -1830,7 +1848,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/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
index 36a42c6..084771a 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwifiex/main.c
 +++ b/drivers/net/wireless/mwifiex/main.c
-@@ -1137,9 +1137,19 @@ static struct net_device_stats *mwifiex_
+@@ -1185,9 +1185,19 @@ static struct net_device_stats *mwifiex_
  	return &priv->stats;
  }
  
diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
index 5f07dd0..c19d92c 100644
--- a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
@@ -1,6 +1,6 @@
 --- a/net/bluetooth/6lowpan.c
 +++ b/net/bluetooth/6lowpan.c
-@@ -646,7 +646,9 @@ static netdev_tx_t bt_xmit(struct sk_buf
+@@ -645,7 +645,9 @@ static netdev_tx_t bt_xmit(struct sk_buf
  	return err < 0 ? NET_XMIT_DROP : err;
  }
  
@@ -10,7 +10,7 @@
  static struct lock_class_key bt_netdev_xmit_lock_key;
  
  static void bt_set_lockdep_class_one(struct net_device *dev,
-@@ -659,7 +661,9 @@ static void bt_set_lockdep_class_one(str
+@@ -658,7 +660,9 @@ static void bt_set_lockdep_class_one(str
  static int bt_dev_init(struct net_device *dev)
  {
  	netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL);
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 f29b66e..457b38c 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
-@@ -7526,6 +7526,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7530,6 +7530,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);
-@@ -7535,6 +7536,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7539,6 +7540,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 0bca051..886c9cb 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
@@ -17,7 +17,7 @@
  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 *);
-@@ -7188,8 +7196,14 @@ static void igb_vlan_mode(struct net_dev
+@@ -7192,8 +7200,14 @@ static void igb_vlan_mode(struct net_dev
  	igb_rlpml_set(adapter);
  }
  
@@ -32,7 +32,7 @@
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7203,11 +7217,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7207,11 +7221,19 @@ static int igb_vlan_rx_add_vid(struct ne
  
  	set_bit(vid, adapter->active_vlans);
  
@@ -52,7 +52,7 @@
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7223,7 +7245,9 @@ static int igb_vlan_rx_kill_vid(struct n
+@@ -7227,7 +7249,9 @@ static int igb_vlan_rx_kill_vid(struct n
  
  	clear_bit(vid, adapter->active_vlans);
  
@@ -62,7 +62,7 @@
  }
  
  static void igb_restore_vlan(struct igb_adapter *adapter)
-@@ -7233,7 +7257,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7237,7 +7261,11 @@ static void igb_restore_vlan(struct igb_
  	igb_vlan_mode(adapter->netdev, adapter->netdev->features);
  
  	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
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 3af7b32..205d094 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
-@@ -7854,6 +7854,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7858,6 +7858,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;
  
-@@ -7867,7 +7868,17 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7871,7 +7872,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/0047-write_iter/bluetooth.patch b/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
index 692b777..aa888d7 100644
--- a/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/hci_vhci.c
 +++ b/drivers/bluetooth/hci_vhci.c
-@@ -159,6 +159,7 @@ static int vhci_create_device(struct vhc
+@@ -151,6 +151,7 @@ static int vhci_create_device(struct vhc
  	return 0;
  }
  
@@ -8,7 +8,7 @@
  static inline ssize_t vhci_get_user(struct vhci_data *data,
  				    struct iov_iter *from)
  {
-@@ -166,6 +167,17 @@ static inline ssize_t vhci_get_user(stru
+@@ -158,6 +159,17 @@ static inline ssize_t vhci_get_user(stru
  	struct sk_buff *skb;
  	__u8 pkt_type, opcode;
  	int ret;
@@ -26,7 +26,7 @@
  
  	if (len < 2 || len > HCI_MAX_FRAME_SIZE)
  		return -EINVAL;
-@@ -174,10 +186,20 @@ static inline ssize_t vhci_get_user(stru
+@@ -166,10 +178,20 @@ static inline ssize_t vhci_get_user(stru
  	if (!skb)
  		return -ENOMEM;
  
@@ -47,7 +47,7 @@
  
  	pkt_type = *((__u8 *) skb->data);
  	skb_pull(skb, 1);
-@@ -289,12 +311,21 @@ static ssize_t vhci_read(struct file *fi
+@@ -281,12 +303,21 @@ static ssize_t vhci_read(struct file *fi
  	return ret;
  }
  
@@ -69,7 +69,7 @@
  }
  
  static unsigned int vhci_poll(struct file *file, poll_table *wait)
-@@ -359,7 +390,11 @@ static int vhci_release(struct inode *in
+@@ -351,7 +382,11 @@ static int vhci_release(struct inode *in
  static const struct file_operations vhci_fops = {
  	.owner		= THIS_MODULE,
  	.read		= vhci_read,
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index 0a60b78..d17c489 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -49,7 +49,7 @@
  int l2cap_init_sockets(void);
 --- a/net/bluetooth/6lowpan.c
 +++ b/net/bluetooth/6lowpan.c
-@@ -533,11 +533,18 @@ static int send_pkt(struct l2cap_chan *c
+@@ -532,11 +532,18 @@ static int send_pkt(struct l2cap_chan *c
  	 */
  	chan->data = skb;
  
@@ -68,7 +68,7 @@
  
  	err = l2cap_chan_send(chan, &msg, skb->len);
  	if (err > 0) {
-@@ -1056,6 +1063,9 @@ static const struct l2cap_ops bt_6lowpan
+@@ -1036,6 +1043,9 @@ static const struct l2cap_ops bt_6lowpan
  	.suspend		= chan_suspend_cb,
  	.get_sndtimeo		= chan_get_sndtimeo_cb,
  	.alloc_skb		= chan_alloc_skb_cb,
@@ -175,7 +175,7 @@
  
  	l2cap_chan_send(chan, &msg, 1 + len);
  
-@@ -3058,6 +3063,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -3059,6 +3064,9 @@ static const struct l2cap_ops smp_chan_o
  	.suspend		= l2cap_chan_no_suspend,
  	.set_shutdown		= l2cap_chan_no_set_shutdown,
  	.get_sndtimeo		= l2cap_chan_no_get_sndtimeo,
@@ -185,7 +185,7 @@
  };
  
  static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
-@@ -3106,6 +3114,9 @@ static const struct l2cap_ops smp_root_c
+@@ -3107,6 +3115,9 @@ static const struct l2cap_ops smp_root_c
  	.resume			= l2cap_chan_no_resume,
  	.set_shutdown		= l2cap_chan_no_set_shutdown,
  	.get_sndtimeo		= l2cap_chan_no_get_sndtimeo,
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 ed41932..3596d6c 100644
--- a/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch
+++ b/patches/collateral-evolutions/network/0052-deactivate-ptp-pin/igb.patch
@@ -8,8 +8,8 @@
  	struct ptp_pin_desc sdp_config[IGB_N_SDP];
 +#endif
  	struct {
- 		struct timespec start;
- 		struct timespec period;
+ 		struct timespec64 start;
+ 		struct timespec64 period;
 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
 @@ -115,6 +115,7 @@ static cycle_t igb_ptp_read_82580(const
diff --git a/patches/collateral-evolutions/network/0053-possible_net_t.patch b/patches/collateral-evolutions/network/0053-possible_net_t.patch
index aa470f9..a68a172 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
-@@ -3242,12 +3242,12 @@ struct wiphy {
+@@ -3254,12 +3254,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 7c65bcc..0b297c9 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
-@@ -1778,8 +1778,12 @@ static void btusb_intel_bootup(struct bt
+@@ -1866,8 +1866,12 @@ static void btusb_intel_bootup(struct bt
  		return;
  
  	if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) {
@@ -13,7 +13,7 @@
  	}
  }
  
-@@ -1796,8 +1800,12 @@ static void btusb_intel_secure_send_resu
+@@ -1884,8 +1888,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 @@
  	}
  }
  
-@@ -2152,6 +2160,7 @@ static int btusb_setup_intel_new(struct
+@@ -2237,6 +2245,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));
-@@ -2166,6 +2175,31 @@ static int btusb_setup_intel_new(struct
+@@ -2251,6 +2260,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);
-@@ -2205,6 +2239,7 @@ done:
+@@ -2290,6 +2324,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));
-@@ -2218,6 +2253,33 @@ done:
+@@ -2303,6 +2338,33 @@ done:
  		BT_ERR("%s: Device boot timeout", hdev->name);
  		return -ETIMEDOUT;
  	}
diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/hci_intel.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/hci_intel.patch
index 1faf5ab..1e9a573 100644
--- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/hci_intel.patch
+++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/hci_intel.patch
@@ -86,7 +86,7 @@
  
  	return err;
  }
-@@ -835,6 +887,7 @@ static int intel_setup(struct hci_uart *
+@@ -836,6 +888,7 @@ static int intel_setup(struct hci_uart *
  	 * and thus just timeout if that happens and fail the setup
  	 * of this device.
  	 */
@@ -94,7 +94,7 @@
  	err = wait_on_bit_timeout(&intel->flags, STATE_DOWNLOADING,
  				  TASK_INTERRUPTIBLE,
  				  msecs_to_jiffies(5000));
-@@ -849,6 +902,33 @@ static int intel_setup(struct hci_uart *
+@@ -850,6 +903,33 @@ static int intel_setup(struct hci_uart *
  		err = -ETIMEDOUT;
  		goto done;
  	}
@@ -128,7 +128,7 @@
  
  	if (test_bit(STATE_FIRMWARE_FAILED, &intel->flags)) {
  		bt_dev_err(hdev, "Firmware loading failed");
-@@ -980,8 +1060,12 @@ static int intel_recv_event(struct hci_d
+@@ -981,8 +1061,12 @@ static int intel_recv_event(struct hci_d
  
  		if (test_and_clear_bit(STATE_DOWNLOADING, &intel->flags) &&
  		    test_bit(STATE_FIRMWARE_LOADED, &intel->flags)) {
@@ -141,7 +141,7 @@
  		}
  
  	/* When switching to the operational firmware the device
-@@ -991,8 +1075,12 @@ static int intel_recv_event(struct hci_d
+@@ -992,8 +1076,12 @@ static int intel_recv_event(struct hci_d
  	} else if (skb->len == 9 && hdr->evt == 0xff && hdr->plen == 0x07 &&
  		   skb->data[2] == 0x02) {
  		if (test_and_clear_bit(STATE_BOOTING, &intel->flags)) {
@@ -154,7 +154,7 @@
  		}
  	}
  recv:
-@@ -1031,15 +1119,23 @@ static int intel_recv_lpm(struct hci_dev
+@@ -1032,15 +1120,23 @@ static int intel_recv_lpm(struct hci_dev
  	case LPM_OP_SUSPEND_ACK:
  		set_bit(STATE_SUSPENDED, &intel->flags);
  		if (test_and_clear_bit(STATE_LPM_TRANSACTION, &intel->flags)) {
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 276ba1b..c68e9d0 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/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
-@@ -2215,7 +2215,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
+@@ -2204,7 +2204,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/0059-uuid-in-mei/nfc.patch b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
index 69e20e2..903cac3 100644
--- a/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
+++ b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
@@ -1,11 +1,13 @@
 --- a/drivers/nfc/microread/mei.c
 +++ b/drivers/nfc/microread/mei.c
-@@ -67,7 +67,11 @@ static int microread_mei_remove(struct m
+@@ -67,7 +67,13 @@ static int microread_mei_remove(struct m
  }
  
  static struct mei_cl_device_id microread_mei_tbl[] = {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
- 	{ MICROREAD_DRIVER_NAME, MEI_NFC_UUID},
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+ 	{ MICROREAD_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY},
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
++	{ MICROREAD_DRIVER_NAME, MEI_NFC_UUID},
 +#else
 +	{ MICROREAD_DRIVER_NAME},
 +#endif
@@ -14,12 +16,14 @@
  	{ }
 --- a/drivers/nfc/pn544/mei.c
 +++ b/drivers/nfc/pn544/mei.c
-@@ -67,7 +67,11 @@ static int pn544_mei_remove(struct mei_c
+@@ -67,7 +67,13 @@ static int pn544_mei_remove(struct mei_c
  }
  
  static struct mei_cl_device_id pn544_mei_tbl[] = {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
- 	{ PN544_DRIVER_NAME, MEI_NFC_UUID},
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+ 	{ PN544_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY},
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
++	{ PN544_DRIVER_NAME, MEI_NFC_UUID},
 +#else
 +	{ PN544_DRIVER_NAME},
 +#endif
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 9e77bb0..1738b9f 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
@@ -9,8 +9,8 @@
 +#endif
  #include <linux/tty.h>
  #include <linux/interrupt.h>
- 
-@@ -141,8 +143,10 @@ static int bcm_gpio_set_power(struct bcm
+ #include <linux/dmi.h>
+@@ -148,8 +150,10 @@ static int bcm_gpio_set_power(struct bcm
  	if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled)
  		clk_enable(dev->clk);
  
@@ -21,7 +21,7 @@
  
  	if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled)
  		clk_disable(dev->clk);
-@@ -447,7 +451,9 @@ static int bcm_suspend(struct device *de
+@@ -520,7 +524,9 @@ static int bcm_suspend_device(struct dev
  
  	/* Suspend the device */
  	if (bdev->device_wakeup) {
@@ -31,8 +31,8 @@
  		bt_dev_dbg(bdev, "suspend, delaying 15 ms");
  		mdelay(15);
  	}
-@@ -482,7 +488,9 @@ static int bcm_resume(struct device *dev
- 	}
+@@ -535,7 +541,9 @@ static int bcm_resume_device(struct devi
+ 	bt_dev_dbg(bdev, "");
  
  	if (bdev->device_wakeup) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
@@ -41,7 +41,7 @@
  		bt_dev_dbg(bdev, "resume, delaying 15 ms");
  		mdelay(15);
  	}
-@@ -501,6 +509,7 @@ unlock:
+@@ -618,6 +626,7 @@ unlock:
  }
  #endif
  
@@ -49,15 +49,15 @@
  static const struct acpi_gpio_params device_wakeup_gpios = { 0, 0, false };
  static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false };
  static const struct acpi_gpio_params host_wakeup_gpios = { 2, 0, false };
-@@ -512,7 +521,6 @@ static const struct acpi_gpio_mapping ac
+@@ -629,7 +638,6 @@ static const struct acpi_gpio_mapping ac
  	{ },
  };
  
 -#ifdef CONFIG_ACPI
- static int bcm_resource(struct acpi_resource *ares, void *data)
- {
- 	struct bcm_device *dev = data;
-@@ -683,7 +691,7 @@ static const struct hci_uart_proto bcm_p
+ static u8 acpi_active_low = ACPI_ACTIVE_LOW;
+ 
+ /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */
+@@ -811,7 +819,7 @@ static const struct hci_uart_proto bcm_p
  	.dequeue	= bcm_dequeue,
  };
  
@@ -66,7 +66,7 @@
  static const struct acpi_device_id bcm_acpi_match[] = {
  	{ "BCM2E39", 0 },
  	{ "BCM2E67", 0 },
-@@ -700,7 +708,9 @@ static struct platform_driver bcm_driver
+@@ -831,7 +839,9 @@ static struct platform_driver bcm_driver
  	.remove = bcm_remove,
  	.driver = {
  		.name = "hci_bcm",
diff --git a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch
index 971bffb..0e1bea0 100644
--- a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch
+++ b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch
@@ -20,9 +20,9 @@
  
  		/* Provide to idev a hu reference which is used to run LPM
  		 * transactions (lpm suspend/resume) from PM callbacks.
-@@ -1352,14 +1356,17 @@ static int intel_probe(struct platform_d
- 		return -ENODEV;
- 	}
+@@ -1329,14 +1333,17 @@ static int intel_probe(struct platform_d
+ 
+ 	idev->pdev = pdev;
  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
  	idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset",
@@ -38,7 +38,7 @@
  	if (idev->irq < 0) {
  		struct gpio_desc *host_wake;
  
-@@ -1378,12 +1385,15 @@ static int intel_probe(struct platform_d
+@@ -1355,12 +1362,15 @@ static int intel_probe(struct platform_d
  			goto no_irq;
  		}
  	}
@@ -54,7 +54,7 @@
  	platform_set_drvdata(pdev, idev);
  
  	/* Place this instance on the device list */
-@@ -1391,8 +1401,10 @@ no_irq:
+@@ -1368,8 +1378,10 @@ no_irq:
  	list_add_tail(&idev->list, &intel_device_list);
  	mutex_unlock(&intel_device_list_lock);
  
-- 
2.6.2

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

Re: [PATCH 04/10] header: add ktime_get_ns()

[Johannes Berg]

On Sat, 2015-11-07 at 17:55 +0100, Hauke Mehrtens wrote:
> We also have to add the prototype of ktime_t ktime_get(), because
> including linux/hrtimer.h caused some strange build errors.
> 
Strange, didn't happen here, but I didn't test that many kernel
versions.

Thanks!

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