summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2022-05-11 10:11:52 +0200
committerPiotr Gorski2022-05-11 10:11:52 +0200
commitcd6e23727eb295683ee17dcbd3a7d8fdb8ed4f10 (patch)
tree0048676fb2b446cf9e4bd39d2223f5d0af231e79
parent2f47bef82dd8e25bc969c8b5e3c92252f32ad74c (diff)
downloadaur-cd6e23727eb295683ee17dcbd3a7d8fdb8ed4f10.tar.gz
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--config15
3 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fecd4dffdc5..cbba086d1790 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-uksm
pkgdesc = Linux UKSM
pkgver = 5.17.6
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/dolohow/uksm
arch = x86_64
license = GPL2
@@ -44,7 +44,7 @@ pkgbase = linux-uksm
sha512sums = 9d905da7321f165ed36bf42803f80a386c1d09c6335919164871a03dc15ffe8e1204de522099051f3effc07b126f5b2d692f3f7c20d576a384eb56540af890b6
sha512sums = de068782a004f79be4d56a6b207ea1dafc9aeb71688f26ee5f7c5ea1df17e63a29484bba10be1418a2f3643426541471d1bc28a699cfa94f86dc494e44f36712
sha512sums = e0f473fa58e4aa54aa598f5bd5af15b9d3055a7f9cefb73e050ae6602b4474ec4bce60a863f3ab6c2b28c313e9e104cbfedbe782edf0d51b3f136ea9863a4bc4
- sha512sums = 61e37954559d078128ca9c6da8298b7344886b15b32318e8b92511e3f2d672dad6523320874aa67158baffee985b88f94dd24ac4733239b452e7f1742e1b3171
+ sha512sums = a9e84eae77089d9337da4457d1026328d6616bb03f4b2fd0104a492344a6f5b4d1c86b94f53642f00b76f8e72e8c513769cdd8ee7a7792ebf7639990e182949c
pkgname = linux-uksm
pkgdesc = The Linux UKSM kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index cd1de9e9def7..0fe578feb905 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ _major=5.17
_minor=6
pkgver=${_major}.${_minor}
_srcname=linux-${pkgver}
-pkgrel=2
+pkgrel=3
pkgdesc='Linux UKSM'
arch=('x86_64')
url="https://github.com/dolohow/uksm"
@@ -331,7 +331,7 @@ sha512sums=('e3f3476d68c9c260c70bf405b7159a3e59fcaa82120287d826cdf77645aeaf2d644
'9d905da7321f165ed36bf42803f80a386c1d09c6335919164871a03dc15ffe8e1204de522099051f3effc07b126f5b2d692f3f7c20d576a384eb56540af890b6'
'de068782a004f79be4d56a6b207ea1dafc9aeb71688f26ee5f7c5ea1df17e63a29484bba10be1418a2f3643426541471d1bc28a699cfa94f86dc494e44f36712'
'e0f473fa58e4aa54aa598f5bd5af15b9d3055a7f9cefb73e050ae6602b4474ec4bce60a863f3ab6c2b28c313e9e104cbfedbe782edf0d51b3f136ea9863a4bc4'
- '61e37954559d078128ca9c6da8298b7344886b15b32318e8b92511e3f2d672dad6523320874aa67158baffee985b88f94dd24ac4733239b452e7f1742e1b3171')
+ 'a9e84eae77089d9337da4457d1026328d6616bb03f4b2fd0104a492344a6f5b4d1c86b94f53642f00b76f8e72e8c513769cdd8ee7a7792ebf7639990e182949c')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/config b/config
index eebbd13a6eca..30d690a06dd9 100644
--- a/config
+++ b/config
@@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.17.6-arch1 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110200
+CONFIG_GCC_VERSION=120100
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23800
@@ -351,6 +351,8 @@ CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
+CONFIG_CC_HAS_SLS=y
+CONFIG_SLS=y
CONFIG_X86_CPU_RESCTRL=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_X86_INTEL_LPSS=y
@@ -10082,16 +10084,15 @@ CONFIG_LSM="landlock,lockdown,yama,bpf"
#
# Kernel hardening options
#
-CONFIG_GCC_PLUGIN_STRUCTLEAK=y
#
# Memory initialization
#
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
# CONFIG_INIT_STACK_NONE is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+CONFIG_INIT_STACK_ALL_ZERO=y
# CONFIG_GCC_PLUGIN_STACKLEAK is not set
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set