From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Wed, 10 Jan 2018 14:06:52 +0000 (+0000)
Subject: kernel: bump 4.14 to 4.14.13
X-Git-Tag: v18.06.0-rc1~1337
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7c7586b6d05926f2d9538dbd9fce9d31df706caa;p=openwrt%2Fstaging%2Fchunkeey.git

kernel: bump 4.14 to 4.14.13

Refresh patches

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index e605dd0a6e..87d3ff172d 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .111
 LINUX_VERSION-4.9 = .76
-LINUX_VERSION-4.14 = .12
+LINUX_VERSION-4.14 = .13
 
 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.111 = a201282e8eaf62b4f51edb2241e98ff805fe2d1b04a72a2328c5a6e2d77ec008
 LINUX_KERNEL_HASH-4.9.76 = b82b94332cffaaeade74495264c989dafb96d4748503f87a5b7c436f5de887de
-LINUX_KERNEL_HASH-4.14.12 = 6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af
+LINUX_KERNEL_HASH-4.14.13 = 4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
index 1df3f6a675..6b1eaf92a2 100644
--- a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
@@ -1,14 +1,14 @@
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
-@@ -684,6 +684,7 @@ static int cvm_oct_probe(struct platform
+@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
  	int interface;
  	int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
  	int qos;
 +	int i;
  	struct device_node *pip;
+ 	int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
  
- 	octeon_mdiobus_force_mod_depencency();
-@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform
+@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
  	}
  
  	num_interfaces = cvmx_helper_get_number_of_interfaces();
diff --git a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
index 2a4ad1dc73..e902e853e8 100644
--- a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
+++ b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/cavium-octeon/setup.c
 +++ b/arch/mips/cavium-octeon/setup.c
-@@ -656,6 +656,35 @@ void octeon_user_io_init(void)
+@@ -650,6 +650,35 @@ void octeon_user_io_init(void)
  	write_c0_derraddr1(0);
  }
  
@@ -36,12 +36,12 @@
  /**
   * Early entry point for arch setup
   */
-@@ -900,6 +929,8 @@ void __init prom_init(void)
+@@ -894,6 +923,8 @@ void __init prom_init(void)
  		}
  	}
  
 +	octeon_use_image_cmdline();
 +
  	if (strstr(arcs_cmdline, "console=") == NULL) {
- #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
- 		strcat(arcs_cmdline, " console=ttyS0,115200");
+ 		if (octeon_uart == 1)
+ 			strcat(arcs_cmdline, " console=ttyS1,115200");
diff --git a/target/linux/octeon/patches-4.14/170-cisco-hack.patch b/target/linux/octeon/patches-4.14/170-cisco-hack.patch
index 124bcfd7a7..72774209dc 100644
--- a/target/linux/octeon/patches-4.14/170-cisco-hack.patch
+++ b/target/linux/octeon/patches-4.14/170-cisco-hack.patch
@@ -18,7 +18,7 @@ Signed-off-by: Michał Osowiecki <michal.osowiecki@gmail.com>
 
 --- a/arch/mips/cavium-octeon/setup.c
 +++ b/arch/mips/cavium-octeon/setup.c
-@@ -1005,6 +1005,10 @@ void __init plat_mem_setup(void)
+@@ -1018,6 +1018,10 @@ void __init plat_mem_setup(void)
  	if (mem_alloc_size > max_memory)
  		mem_alloc_size = max_memory;