From 9ecc9802d2eb1c3c1b5562b90568957d66b0f468 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Thu, 31 Oct 2019 15:57:15 -0400 Subject: [PATCH] Bump kernel to 4.14.151 --- include/kernel-version.mk | 4 ++-- target/linux/generic/pending-4.14/220-optimize_inlining.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 66a91a369a..9fab6f9672 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 = .150 +LINUX_VERSION-4.14 = .151 -LINUX_KERNEL_HASH-4.14.150 = 232debef0e78e4da88c3ec30fc03f158554f1f11250589d109f1c9ce522bff3b +LINUX_KERNEL_HASH-4.14.151 = 2e4dca5f7e4209fc978b5266d15460ddc03cece97495eeffadba177d3c2d2475 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/pending-4.14/220-optimize_inlining.patch b/target/linux/generic/pending-4.14/220-optimize_inlining.patch index ff2bed17f3..76aabf86db 100644 --- a/target/linux/generic/pending-4.14/220-optimize_inlining.patch +++ b/target/linux/generic/pending-4.14/220-optimize_inlining.patch @@ -11,7 +11,7 @@ early_print("no ATAGS support: can't continue\n"); --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h -@@ -126,7 +126,7 @@ static inline bool cpu_have_feature(unsi +@@ -347,7 +347,7 @@ static inline bool cpu_have_feature(unsi } /* System capability check for constant caps */ @@ -20,7 +20,7 @@ { if (num >= ARM64_NCAPS) return false; -@@ -140,7 +140,7 @@ static inline bool cpus_have_cap(unsigne +@@ -361,7 +361,7 @@ static inline bool cpus_have_cap(unsigne return test_bit(num, cpu_hwcaps); } -- 2.25.1