From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 18 Nov 2019 17:10:11 +0000 (-0500)
Subject: Bump kernel to 4.14.152
X-Git-Tag: v1.5.0~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=138f74b0fc92454ff11a39a6e425b5b10dcd6fac;p=librecmc%2Flibrecmc.git

Bump kernel to 4.14.152
---

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9fab6f9672..ef74bbdee7 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .151
+LINUX_VERSION-4.14 = .152
 
-LINUX_KERNEL_HASH-4.14.151 = 2e4dca5f7e4209fc978b5266d15460ddc03cece97495eeffadba177d3c2d2475
+LINUX_KERNEL_HASH-4.14.152 = d28f9b524b6056c8b5c807ad147d36b0ecdadb41963c08144b03d09d276a4f2d
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
index 0a4925d6fa..cf03b00f82 100644
--- a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/net/sch_generic.h
 +++ b/include/net/sch_generic.h
-@@ -368,12 +368,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
+@@ -373,12 +373,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
  extern struct Qdisc_ops pfifo_fast_ops;
  extern struct Qdisc_ops mq_qdisc_ops;
  extern struct Qdisc_ops noqueue_qdisc_ops;
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	  device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2029,7 +2029,7 @@ static int __init pktsched_init(void)
+@@ -2031,7 +2031,7 @@ static int __init pktsched_init(void)
  		return err;
  	}