summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoregnappahz2022-07-23 13:39:18 +0200
committeregnappahz2022-07-23 13:39:18 +0200
commitf0565b045fafdb18f25657302bed9d9d4e11e3b0 (patch)
tree1f92d3c6ce96b35de64ff0680bd23e4211a07ad2
parent7e6d6ac6558653aa107cf1c1d2f02f8e43e979b7 (diff)
downloadaur-f0565b045fafdb18f25657302bed9d9d4e11e3b0.tar.gz
Updated
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--config.x86_6415
3 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ad33e818a28..24453e78239c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-amd
- pkgver = 5.18.v.13
+ pkgver = 5.18.v.14
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -14,13 +14,13 @@ pkgbase = linux-amd
makedepends = lzop
makedepends = gcc>=10.3
options = !strip
- source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v5.18.13
+ source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v5.18.14
source = config.x86_64
source = linux-amd.preset
source = linux.install
source = https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/20220315/more-uarches-for-kernel-5.17+.patch
sha256sums = SKIP
- sha256sums = 92a93b74062ae6ec3609a189dd5fa8807a41f4ea511ee4e6fdcd0516435377b5
+ sha256sums = 0edff0498db3586b1c35269532557f110171053a977b49e2a69ff287a11de576
sha256sums = 60c6ba602443e94a9eba3aeee9d194027d69bffaa428c6d055348ebf03681b5c
sha256sums = d590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0
sha256sums = dea86a521603414a8c7bf9cf1f41090d5d6f8035ce31407449e25964befb1e50
diff --git a/PKGBUILD b/PKGBUILD
index 48d044455648..15cb5a188acc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
pkgbase=linux-amd
_srcname=linux
-gitver=v5.18.13
+gitver=v5.18.14
patchver=20220315
patchname=more-uarches-for-kernel-5.17+.patch
-pkgver=5.18.v.13
+pkgver=5.18.v.14
pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
@@ -25,7 +25,7 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
)
sha256sums=('SKIP'
#config.x86_64
- '92a93b74062ae6ec3609a189dd5fa8807a41f4ea511ee4e6fdcd0516435377b5'
+ '0edff0498db3586b1c35269532557f110171053a977b49e2a69ff287a11de576'
#.preset file
'60c6ba602443e94a9eba3aeee9d194027d69bffaa428c6d055348ebf03681b5c'
#linux install file
diff --git a/config.x86_64 b/config.x86_64
index 6668a8c733d0..a99ed0ed8469 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.13 Kernel Configuration
+# Linux/x86 5.18.14 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -344,9 +344,6 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_CC_HAS_SLS=y
-# CONFIG_SLS is not set
# CONFIG_X86_CPU_RESCTRL is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
# CONFIG_X86_INTEL_LPSS is not set
@@ -543,6 +540,15 @@ CONFIG_HAVE_LIVEPATCH=y
# CONFIG_LIVEPATCH is not set
# end of Processor type and features
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CPU_IBPB_ENTRY=y
+# CONFIG_SLS is not set
CONFIG_ARCH_HAS_ADD_PAGES=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
@@ -9035,7 +9041,6 @@ CONFIG_KEY_DH_OPERATIONS=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
# CONFIG_SECURITY_NETWORK is not set
-CONFIG_PAGE_TABLE_ISOLATION=y
# CONFIG_SECURITY_INFINIBAND is not set
# CONFIG_SECURITY_PATH is not set
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y