From 418508c99831afb0cb429f1abffa6da53a4f459e Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Wed, 10 Jan 2024 19:42:10 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 6 +++--- PKGBUILD | 8 ++++---- config | 34 ++++++++++++++++------------------ 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45a2e4287e69..d36c5c78ccdf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-eevdf pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.7.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -27,9 +27,9 @@ pkgbase = linux-cachyos-eevdf source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/all/0001-cachyos-base-all.patch b2sums = cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e - b2sums = c7c3eef86b0aefc7ce7c8cc48b4efbb0bfecffc675c63a9e684ed152adf8370e7cfcd9d7b7899d73a6a76c643cf9138472e73fbdd2ac0b453733fcad139a5954 + b2sums = da55af914e4d3e694009d534e89c8b73b23c174662a4bab6857b3e6ad51bb03a8d9ea7439e2dca2329fbeccbc6894e52ad90538649471e5b24328ecef7485575 b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d - b2sums = 0f091f924fa2f23991bddba283deff215cd4f3df85f780130a6a481868b5d36134605b895793a258cc536f9be678f9bea49cc9a644676e0164eb578cc625daa0 + b2sums = a5827fbb69f4c1c3a4b4e4e8e5fb0bc0270ff7813bffe2d268aa13c541622f904d2a0be82fe869666600f19c7d68b48594eeedb12d05112dfeee7b0fbffcff39 pkgname = linux-cachyos-eevdf pkgdesc = The Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 30b7bc009325..77d6a5e30304 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -174,7 +174,7 @@ _stable=${_major} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=1 +pkgrel=2 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -227,7 +227,7 @@ case "$_cpusched" in cachyos) # CachyOS Scheduler (EEVDF + BORE) source+=("${_patchsource}/sched/0001-bore-cachy.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore.patch");; + source+=("${_patchsource}/sched/0001-bore-cachy.patch");; rt) ## EEVDF with RT patches source+=("${_patchsource}/misc/0001-rt.patch" linux-cachyos-rt.install);; @@ -820,6 +820,6 @@ for _p in "${pkgname[@]}"; do done b2sums=('cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e' - 'c7c3eef86b0aefc7ce7c8cc48b4efbb0bfecffc675c63a9e684ed152adf8370e7cfcd9d7b7899d73a6a76c643cf9138472e73fbdd2ac0b453733fcad139a5954' + 'da55af914e4d3e694009d534e89c8b73b23c174662a4bab6857b3e6ad51bb03a8d9ea7439e2dca2329fbeccbc6894e52ad90538649471e5b24328ecef7485575' '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d' - '0f091f924fa2f23991bddba283deff215cd4f3df85f780130a6a481868b5d36134605b895793a258cc536f9be678f9bea49cc9a644676e0164eb578cc625daa0') + 'a5827fbb69f4c1c3a4b4e4e8e5fb0bc0270ff7813bffe2d268aa13c541622f904d2a0be82fe869666600f19c7d68b48594eeedb12d05112dfeee7b0fbffcff39') diff --git a/config b/config index 3c3f77a2e9f0..28e6956d3c11 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.7.0-rc4 Kernel Configuration +# Linux/x86 6.7.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20231110" CONFIG_CC_IS_GCC=y @@ -1251,9 +1251,9 @@ CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y -CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y +CONFIG_USERFAULTFD=y CONFIG_PTE_MARKER_UFFD_WP=y CONFIG_LRU_GEN=y CONFIG_LRU_GEN_ENABLED=y @@ -9031,7 +9031,7 @@ CONFIG_XEN_PVCALLS_FRONTEND=m CONFIG_XEN_PVCALLS_BACKEND=y CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m -# CONFIG_XEN_PRIVCMD_EVENTFD is not set +CONFIG_XEN_PRIVCMD_EVENTFD=y CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_XEN_MCE_LOG=y CONFIG_XEN_HAVE_PVMMU=y @@ -10443,11 +10443,11 @@ CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y CONFIG_F2FS_UNFAIR_RWSEM=y -CONFIG_BCACHEFS_FS=y +CONFIG_BCACHEFS_FS=m CONFIG_BCACHEFS_QUOTA=y -CONFIG_BCACHEFS_ERASURE_CODING=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set CONFIG_BCACHEFS_POSIX_ACL=y -# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set +CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y # CONFIG_BCACHEFS_DEBUG is not set # CONFIG_BCACHEFS_TESTS is not set CONFIG_BCACHEFS_LOCK_TIME_STATS=y @@ -10898,7 +10898,7 @@ CONFIG_RANDSTRUCT_NONE=y # end of Kernel hardening options # end of Security options -CONFIG_XOR_BLOCKS=y +CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m @@ -10979,7 +10979,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m # Length-preserving ciphers and modes # CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_CHACHA20=y +CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y @@ -11019,7 +11019,7 @@ CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=y +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -11037,7 +11037,7 @@ CONFIG_CRYPTO_XXHASH=m # # CRCs (cyclic redundancy checks) # -CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRC64_ROCKSOFT=y @@ -11185,7 +11185,7 @@ CONFIG_BINARY_PRINTF=y # # Library routines # -CONFIG_RAID6_PQ=y +CONFIG_RAID6_PQ=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_LINEAR_RANGES=y CONFIG_PACKING=y @@ -11212,7 +11212,7 @@ CONFIG_CRYPTO_LIB_GF128MUL=m CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m @@ -11220,7 +11220,7 @@ CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=m CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -11241,7 +11241,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC64=y CONFIG_CRC4=m CONFIG_CRC7=m -CONFIG_LIBCRC32C=y +CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set @@ -11251,8 +11251,8 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=y -CONFIG_LZ4HC_COMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y @@ -11573,8 +11573,6 @@ CONFIG_DEBUG_LIST=y # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures -# CONFIG_DEBUG_CREDENTIALS is not set - # # RCU Debugging #