Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06942c99dc8a0e04df1a2c20d47cc2b7d6103f79
commit 06942c99dc8a0e04df1a2c20d47cc2b7d6103f79 Author: DeX77 <[email protected]> Date: Sun Jan 7 18:55:24 2018 +0100 kernel-4.14.12-1-x86_64 * version bump diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 48c16d4..be6e83d 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -38,7 +38,6 @@ _F_kernel_patches=( # mute PPS error shit .. buggy in 4.14.x mute-pps_state_mismatch.patch fix-e1000e-nm.patch - consider-amd-secure.patch ) for ppatch in "${_F_kernel_patches[@]}" diff --git a/source/base/kernel/consider-amd-secure.patch b/source/base/kernel/consider-amd-secure.patch deleted file mode 100644 index fe85916..0000000 --- a/source/base/kernel/consider-amd-secure.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - arch/x86/kernel/cpu/common.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index f2a94df..b1be494 100644 ---- a/arch/x86/kernel/cpu/common.c -+++ b/arch/x86/kernel/cpu/common.c -@@ -899,8 +899,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) - - setup_force_cpu_cap(X86_FEATURE_ALWAYS); - -- /* Assume for now that ALL x86 CPUs are insecure */ -- setup_force_cpu_bug(X86_BUG_CPU_INSECURE); -+ if (c->x86_vendor != X86_VENDOR_AMD) -+ setup_force_cpu_bug(X86_BUG_CPU_INSECURE); - - fpu__init_system(c); - - - \ No newline at end of file diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 039e033..e421f94 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,8 +16,8 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) # * _F_kernelver_nextver: the next kernel version ### -_F_kernelver_ver=4.14.11 -_F_kernelver_rel=2 +_F_kernelver_ver=4.14.12 +_F_kernelver_rel=1 ### # == APPENDED VALUES _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
