kernel: bump 4.9 to 4.9.119
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Thu, 9 Aug 2018 15:17:50 +0000 (17:17 +0200)
committerKoen Vandeputte <koen.vandeputte@ncentric.com>
Fri, 10 Aug 2018 16:43:59 +0000 (18:43 +0200)
Refreshed all patches.

Delete upstreamed patch:
- 100-tcp-add-tcp_ooo_try_coalesce-helper.patch

Compile-tested on: ar71xx
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
target/linux/generic/backport-4.9/100-tcp-add-tcp_ooo_try_coalesce-helper.patch [deleted file]
target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch

index 92eeeae..2dc5c2a 100644 (file)
@@ -2,11 +2,11 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-4.9 = .118
 LINUX_VERSION-4.14 = .61
+LINUX_VERSION-4.9 = .119
 
-LINUX_KERNEL_HASH-4.9.118 = 7df789e40c6040cd6f6e34326f477b389ab7eaf2bb04940fca4bbe5e733add57
 LINUX_KERNEL_HASH-4.14.61 = 0d0ec521a771e7d393f25b789a06d9af6e2a5a4837fadc04e7048e03b41c70e8
+LINUX_KERNEL_HASH-4.9.119 = 49e17f01a1a607b4b1ab28dc7177e103943151866c3956fd83edc8a4aae60b35
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
index 5a324dd..4c3d2b1 100644 (file)
@@ -28,10 +28,8 @@ w1-gpio: Sort out the pullup/parasitic power tangle
  include/linux/w1-gpio.h      |  1 +
  5 files changed, 99 insertions(+), 9 deletions(-)
 
-Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/masters/w1-gpio.c
-+++ linux-4.9.111/drivers/w1/masters/w1-gpio.c
+--- a/drivers/w1/masters/w1-gpio.c
++++ b/drivers/w1/masters/w1-gpio.c
 @@ -23,6 +23,19 @@
  #include "../w1.h"
  #include "../w1_int.h"
@@ -145,10 +143,8 @@ Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c
        return 0;
  }
  
-Index: linux-4.9.111/drivers/w1/w1.h
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1.h
-+++ linux-4.9.111/drivers/w1/w1.h
+--- a/drivers/w1/w1.h
++++ b/drivers/w1/w1.h
 @@ -173,6 +173,12 @@ struct w1_bus_master
  
        u8              (*set_pullup)(void *, int);
@@ -162,10 +158,8 @@ Index: linux-4.9.111/drivers/w1/w1.h
        void            (*search)(void *, struct w1_master *,
                u8, w1_slave_found_callback);
  };
-Index: linux-4.9.111/drivers/w1/w1_int.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1_int.c
-+++ linux-4.9.111/drivers/w1/w1_int.c
+--- a/drivers/w1/w1_int.c
++++ b/drivers/w1/w1_int.c
 @@ -122,6 +122,20 @@ int w1_add_master_device(struct w1_bus_m
                return(-EINVAL);
        }
@@ -187,10 +181,8 @@ Index: linux-4.9.111/drivers/w1/w1_int.c
        /* Lock until the device is added (or not) to w1_masters. */
        mutex_lock(&w1_mlock);
        /* Search for the first available id (starting at 1). */
-Index: linux-4.9.111/drivers/w1/w1_io.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1_io.c
-+++ linux-4.9.111/drivers/w1/w1_io.c
+--- a/drivers/w1/w1_io.c
++++ b/drivers/w1/w1_io.c
 @@ -134,10 +134,22 @@ static void w1_pre_write(struct w1_maste
  static void w1_post_write(struct w1_master *dev)
  {
@@ -217,10 +209,8 @@ Index: linux-4.9.111/drivers/w1/w1_io.c
                dev->pullup_duration = 0;
        }
  }
-Index: linux-4.9.111/include/linux/w1-gpio.h
-===================================================================
---- linux-4.9.111.orig/include/linux/w1-gpio.h
-+++ linux-4.9.111/include/linux/w1-gpio.h
+--- a/include/linux/w1-gpio.h
++++ b/include/linux/w1-gpio.h
 @@ -18,6 +18,7 @@
  struct w1_gpio_platform_data {
        unsigned int pin;
diff --git a/target/linux/generic/backport-4.9/100-tcp-add-tcp_ooo_try_coalesce-helper.patch b/target/linux/generic/backport-4.9/100-tcp-add-tcp_ooo_try_coalesce-helper.patch
deleted file mode 100644 (file)
index 4641727..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From 74b120c45aebf4278e1dedc55f5fa24d8ea83cdc Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Mon, 23 Jul 2018 09:28:21 -0700
-Subject: tcp: add tcp_ooo_try_coalesce() helper
-
-commit 58152ecbbcc6a0ce7fddd5bf5f6ee535834ece0c upstream.
-
-In case skb in out_or_order_queue is the result of
-multiple skbs coalescing, we would like to get a proper gso_segs
-counter tracking, so that future tcp_drop() can report an accurate
-number.
-
-I chose to not implement this tracking for skbs in receive queue,
-since they are not dropped, unless socket is disconnected.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
-Acked-by: Yuchung Cheng <ycheng@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/tcp_input.c | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index a9be8df108b4..9d0b73aa649f 100644
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -4370,6 +4370,23 @@ static bool tcp_try_coalesce(struct sock *sk,
-       return true;
- }
-+static bool tcp_ooo_try_coalesce(struct sock *sk,
-+                           struct sk_buff *to,
-+                           struct sk_buff *from,
-+                           bool *fragstolen)
-+{
-+      bool res = tcp_try_coalesce(sk, to, from, fragstolen);
-+
-+      /* In case tcp_drop() is called later, update to->gso_segs */
-+      if (res) {
-+              u32 gso_segs = max_t(u16, 1, skb_shinfo(to)->gso_segs) +
-+                             max_t(u16, 1, skb_shinfo(from)->gso_segs);
-+
-+              skb_shinfo(to)->gso_segs = min_t(u32, gso_segs, 0xFFFF);
-+      }
-+      return res;
-+}
-+
- static void tcp_drop(struct sock *sk, struct sk_buff *skb)
- {
-       sk_drops_add(sk, skb);
-@@ -4493,7 +4510,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
-       /* In the typical case, we are adding an skb to the end of the list.
-        * Use of ooo_last_skb avoids the O(Log(N)) rbtree lookup.
-        */
--      if (tcp_try_coalesce(sk, tp->ooo_last_skb, skb, &fragstolen)) {
-+      if (tcp_ooo_try_coalesce(sk, tp->ooo_last_skb,
-+                               skb, &fragstolen)) {
- coalesce_done:
-               tcp_grow_window(sk, skb);
-               kfree_skb_partial(skb, fragstolen);
-@@ -4543,7 +4561,8 @@ coalesce_done:
-                               tcp_drop(sk, skb1);
-                               goto merge_right;
-                       }
--              } else if (tcp_try_coalesce(sk, skb1, skb, &fragstolen)) {
-+              } else if (tcp_ooo_try_coalesce(sk, skb1,
-+                                              skb, &fragstolen)) {
-                       goto coalesce_done;
-               }
-               p = &parent->rb_right;
--- 
-cgit 1.2-0.3.lf.el7
-
index 5ce2bf8..524c6f9 100644 (file)
@@ -13,11 +13,9 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
  drivers/w1/masters/w1-gpio.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
-index a90728ceec5a..7b80762941af 100644
 --- a/drivers/w1/masters/w1-gpio.c
 +++ b/drivers/w1/masters/w1-gpio.c
-@@ -112,17 +112,16 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
+@@ -113,17 +113,16 @@ static int w1_gpio_probe_dt(struct platf
  static int w1_gpio_probe(struct platform_device *pdev)
  {
        struct w1_bus_master *master;
@@ -38,6 +36,3 @@ index a90728ceec5a..7b80762941af 100644
        if (!pdata) {
                dev_err(&pdev->dev, "No configuration data\n");
                return -ENXIO;
--- 
-2.14.1
-
index 0b5f583..ffb95cc 100644 (file)
@@ -95,7 +95,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  };
  
  static const struct imx_i2c_hwdata imx1_i2c_hwdata = {
-@@ -879,6 +938,78 @@ static int i2c_imx_read(struct imx_i2c_s
+@@ -878,6 +937,78 @@ static int i2c_imx_read(struct imx_i2c_s
        return 0;
  }
  
@@ -174,7 +174,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static int i2c_imx_xfer(struct i2c_adapter *adapter,
                                                struct i2c_msg *msgs, int num)
  {
-@@ -889,6 +1020,19 @@ static int i2c_imx_xfer(struct i2c_adapt
+@@ -888,6 +1019,19 @@ static int i2c_imx_xfer(struct i2c_adapt
  
        dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
  
@@ -194,7 +194,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        result = pm_runtime_get_sync(i2c_imx->adapter.dev.parent);
        if (result < 0)
                goto out;
-@@ -1031,6 +1175,50 @@ static int i2c_imx_init_recovery_info(st
+@@ -1030,6 +1174,50 @@ static int i2c_imx_init_recovery_info(st
        return 0;
  }
  
@@ -245,7 +245,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static u32 i2c_imx_func(struct i2c_adapter *adapter)
  {
        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL
-@@ -1086,6 +1274,11 @@ static int i2c_imx_probe(struct platform
+@@ -1085,6 +1273,11 @@ static int i2c_imx_probe(struct platform
        i2c_imx->adapter.dev.of_node    = pdev->dev.of_node;
        i2c_imx->base                   = base;
  
@@ -257,7 +257,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        /* Get I2C clock */
        i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(i2c_imx->clk)) {
-@@ -1100,7 +1293,7 @@ static int i2c_imx_probe(struct platform
+@@ -1099,7 +1292,7 @@ static int i2c_imx_probe(struct platform
        }
  
        /* Request IRQ */