From 7b8a16d17c5fdcb40ff2701c3129047019b91d2e Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 22 Apr 2025 08:25:49 +0200 Subject: [PATCH] Bump to 6.14.3 Signed-off-by: Piotr Gorski --- .SRCINFO | 10 +++++----- PKGBUILD | 24 ++++++++++++------------ config | 16 +++++++++------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a9cf6d125736..f78a609e9fd3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-cachyos-bore pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.14.2 + pkgver = 6.14.3 pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 @@ -18,15 +18,15 @@ pkgbase = linux-cachyos-bore options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.3.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.14/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.14/sched/0001-bore-cachy.patch - b2sums = ebba8a341d180887bbe125b23a3ac54ca7439eded877930f7b7df9a5ed3378701523e0cde972b520eaedf7f24d70d4d8db62db103e21943abeb35f9c1c91e4a7 - b2sums = 2993c417170e35dca3171263ecc4857bc65de3d037e9ed047d05fd342007ee7965534ef60f6ccbb72042333d63b1012322d77e062b259cac5d292cb9a89ac89c + b2sums = ea23ad9a9ce34ce652f0c159215c1f6612b312f13eb802f77c2962af7397e21a3b8459c389b546c780886fba91e3932b1b17a2d1e103111379fdc97511067de6 + b2sums = d5752eff0a695850c92224fac67dfa28d7572c1833896e2a8aa9b3dfd0a393c28f8141996cab52b314e59313c3e747af4d279d21b25e32d3221402c47f9c1ee9 b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab - b2sums = 2b8fdcc4de9a8f1987ded51290c550336ad487358ad33fb6a6a22bfa70bcebd000fe4168075b143125d60dc99c5cd9a099e9a3dd4f646bbaf94d2fcd2c5982bb + b2sums = 1ce8059a5391931e3fc7965354e359f564a29911bbec59eb9f470baa2337ef185bec2fd19853e651afdfbd43328c3082e8bba3f0d7e781118c8f470652a77341 b2sums = f04f8a1e1a08b3e39b3d037dc703cc4951527ccbf6002a89b3dd09c5fe71dd35310aa524c07270945be6b4db24db099c0d9491ce79b2232c1dfe77da6a934096 pkgname = linux-cachyos-bore diff --git a/PKGBUILD b/PKGBUILD index fdc504e29bec..d71eb1a6c229 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -146,7 +146,7 @@ fi pkgbase="linux-$_pkgsuffix" _major=6.14 -_minor=2 +_minor=3 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -177,7 +177,7 @@ makedepends=( ) _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" -_nv_ver=570.133.07 +_nv_ver=570.144 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}" _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}" source=( @@ -218,7 +218,9 @@ fi if [ "$_build_nvidia_open" = "yes" ]; then source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz" "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch" - "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch") + "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch" + "${_patchsource}/misc/nvidia/0003-Kbuild-Convert-EXTRA_CFLAGS-to-ccflags-y.patch" + "${_patchsource}/misc/nvidia/0008-kbuild-Add-workaround-for-GCC-15-Compilation.patch") fi ## List of CachyOS schedulers @@ -464,12 +466,10 @@ prepare() { fi if [ "$_build_nvidia_open" = "yes" ]; then - # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" \ - -d "${srcdir}/${_nv_open_pkg}/kernel-open" - # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Add-IBT-support.patch" \ - -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/" + patch -Np1 -i "${srcdir}/0003-Kbuild-Convert-EXTRA_CFLAGS-to-ccflags-y.patch" -d"${srcdir}/${_nv_open_pkg}" + patch -Np1 -i "${srcdir}/0008-kbuild-Add-workaround-for-GCC-15-Compilation.patch" -d "${srcdir}/${_nv_open_pkg}/" fi } @@ -701,8 +701,8 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('ebba8a341d180887bbe125b23a3ac54ca7439eded877930f7b7df9a5ed3378701523e0cde972b520eaedf7f24d70d4d8db62db103e21943abeb35f9c1c91e4a7' - '2993c417170e35dca3171263ecc4857bc65de3d037e9ed047d05fd342007ee7965534ef60f6ccbb72042333d63b1012322d77e062b259cac5d292cb9a89ac89c' +b2sums=('ea23ad9a9ce34ce652f0c159215c1f6612b312f13eb802f77c2962af7397e21a3b8459c389b546c780886fba91e3932b1b17a2d1e103111379fdc97511067de6' + 'd5752eff0a695850c92224fac67dfa28d7572c1833896e2a8aa9b3dfd0a393c28f8141996cab52b314e59313c3e747af4d279d21b25e32d3221402c47f9c1ee9' '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab' - '2b8fdcc4de9a8f1987ded51290c550336ad487358ad33fb6a6a22bfa70bcebd000fe4168075b143125d60dc99c5cd9a099e9a3dd4f646bbaf94d2fcd2c5982bb' + '1ce8059a5391931e3fc7965354e359f564a29911bbec59eb9f470baa2337ef185bec2fd19853e651afdfbd43328c3082e8bba3f0d7e781118c8f470652a77341' 'f04f8a1e1a08b3e39b3d037dc703cc4951527ccbf6002a89b3dd09c5fe71dd35310aa524c07270945be6b4db24db099c0d9491ce79b2232c1dfe77da6a934096') diff --git a/config b/config index dfe9f13aa91d..bfdd0f7b3729 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.14.2 Kernel Configuration +# Linux/x86 6.14.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250207" CONFIG_CC_IS_GCC=y @@ -11,7 +11,7 @@ CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108501 +CONFIG_RUSTC_VERSION=108600 CONFIG_RUSTC_LLVM_VERSION=190107 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -20,7 +20,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_CC_HAS_COUNTED_BY=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_RUSTC_HAS_COERCE_POINTEE=y CONFIG_PAHOLE_VERSION=129 CONFIG_IRQ_WORK=y @@ -850,7 +850,7 @@ CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y CONFIG_KVM_COMPAT=y -CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_IRQ_BYPASS=m CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y @@ -5059,7 +5059,8 @@ CONFIG_PPS_CLIENT_KTIMER=m CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_CLIENT_GPIO=m -# CONFIG_PPS_GENERATOR is not set +CONFIG_PPS_GENERATOR=m +# CONFIG_PPS_GENERATOR_DUMMY is not set # # PTP clock support @@ -8268,6 +8269,7 @@ CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_UDRAW_PS3=m CONFIG_HID_U2FZERO=m +CONFIG_HID_UNIVERSAL_PIDFF=m CONFIG_HID_WACOM=m CONFIG_HID_WIIMOTE=m CONFIG_HID_WINWING=m @@ -9257,7 +9259,7 @@ CONFIG_QAT_VFIO_PCI=m # end of VFIO support for PCI devices CONFIG_VFIO_MDEV=m -CONFIG_IRQ_BYPASS_MANAGER=y +CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m @@ -11091,7 +11093,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y CONFIG_NFSD_V4_SECURITY_LABEL=y # CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set -CONFIG_NFSD_V4_DELEG_TIMESTAMPS=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_GRACE_PERIOD=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y