diff --git a/.SRCINFO b/.SRCINFO index 2d366baf0aff..a14a09236e63 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-lts pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.6.31 + pkgver = 6.6.32 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -24,13 +24,13 @@ pkgbase = linux-cachyos-lts options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.31.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.32.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch - sha256sums = d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20 - sha256sums = fdc2b032badafe9eb4b5e27925df057fe6d24dc0803bd37dd4be895f3606dbed + sha256sums = aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 + sha256sums = 821efb2826857d9ab0073366c1f717bd631d146282dab07fd6cbb9f91e088643 sha256sums = 3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec sha256sums = 794a5b743bd94a715957dc5fa391c3e3cd283b4aa12a4af9487565639192ef72 sha256sums = e5bac2247f709a073ff5c901e9ec2043641d0cf61d8e64dcdfd35f489c72c13a diff --git a/PKGBUILD b/PKGBUILD index 42b4bccd1765..5795dad96699 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -170,7 +170,7 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then pkgbase=linux-$pkgsuffix fi _major=6.6 -_minor=31 +_minor=32 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -199,7 +199,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k fi _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=550.78 +_nv_ver=555.42.02 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}" source=( @@ -222,14 +222,12 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch") + "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch") fi @@ -280,7 +278,6 @@ prepare() { src="${src##*/}" src="${src%.zst}" [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." @@ -576,13 +573,10 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" - # Fix for https://bugs.archlinux.org/task/74886 patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" fi @@ -800,8 +794,8 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20' - 'fdc2b032badafe9eb4b5e27925df057fe6d24dc0803bd37dd4be895f3606dbed' +sha256sums=('aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1' + '821efb2826857d9ab0073366c1f717bd631d146282dab07fd6cbb9f91e088643' '3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec' '794a5b743bd94a715957dc5fa391c3e3cd283b4aa12a4af9487565639192ef72' 'e5bac2247f709a073ff5c901e9ec2043641d0cf61d8e64dcdfd35f489c72c13a') diff --git a/config b/config index 02d3fc7a5c41..60fa1a557c85 100644 --- a/config +++ b/config @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.28 Kernel Configuration +# Linux/x86 6.6.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130201 +CONFIG_GCC_VERSION=140101 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -602,7 +602,7 @@ CONFIG_CALL_PADDING=y CONFIG_HAVE_CALL_THUNKS=y CONFIG_CALL_THUNKS=y CONFIG_PREFIX_SYMBOLS=y -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y @@ -832,6 +832,7 @@ CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y CONFIG_AS_WRUSS=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -4668,7 +4669,7 @@ CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m CONFIG_N_HDLC=m CONFIG_IPWIRELESS=m -CONFIG_N_GSM=m +# CONFIG_N_GSM is not set CONFIG_NOZOMI=m CONFIG_NULL_TTY=m CONFIG_HVC_DRIVER=y @@ -6881,6 +6882,7 @@ CONFIG_DRM_PANEL=y # Display Panels # CONFIG_DRM_PANEL_AUO_A030JTN01=m +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m @@ -11404,6 +11406,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y