From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 13 Nov 2019 20:17:31 +0000 (+0100)
Subject: - up to 4.14.154
X-Git-Tag: auto/th/kernel-4.14-4.14.154-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1e43d8126a374d727e07de155d331fbd4e9a332b;p=packages%2Fkernel.git

- up to 4.14.154
---

diff --git a/kernel-x86.config b/kernel-x86.config
index 98676d7a..072fb3fa 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -98,6 +98,9 @@ MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 X86_INTEL_MPX x86=y
 X86_INTEL_MEMORY_PROTECTION_KEYS all=y
+X86_INTEL_TSX_MODE_OFF x86=y
+X86_INTEL_TSX_MODE_ON x86=n
+X86_INTEL_TSX_MODE_AUTO x86=n
 EFI x86=y
 EFI_STUB all=y
 SECCOMP x86=y
@@ -364,7 +367,6 @@ SPARSE_IRQ i386=y x86_64=y
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 DEBUG_STACKOVERFLOW x86=n
-#- file lib/Kconfig.kmemcheck goes here
 #- file lib/Kconfig.kasan goes here
 KCOV all=n
 WW_MUTEX_SELFTEST all=m
diff --git a/kernel.spec b/kernel.spec
index 0ff5017d..b9f0bfd4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define		rel		1
 %define		basever		4.14
-%define		postver		.153
+%define		postver		.154
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -122,7 +122,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	bacdb9ffdcd922aa069a5e1520160e24
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	5109749e665ffaa5a1ece3b3ea96f78d
+# Patch0-md5:	e4bcbf2a4d1b8009528cdff9cfcd020c
 %endif
 Source1:	kernel.sysconfig