Skip to content

Commit 5f11d66

Browse files
committed
env: Update for next-20250422
Signed-off-by: Nathan Chancellor <[email protected]>
1 parent 984ee01 commit 5f11d66

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

configs/kernel/linux-next-llvm.config

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.15.0-rc2 Kernel Configuration
3+
# Linux/x86_64 6.15.0-rc3 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 21.0.0git (https://github.com/llvm/llvm-project.git bf7f602e7d549d9933a8a5f073e65917e7c877de)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 21.0.0git (https://github.com/llvm/llvm-project.git c7ea01b8a0382c21da1f64a9bf077c951096db8e)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=210000
@@ -60,7 +60,6 @@ CONFIG_POSIX_MQUEUE=y
6060
CONFIG_POSIX_MQUEUE_SYSCTL=y
6161
CONFIG_WATCH_QUEUE=y
6262
CONFIG_CROSS_MEMORY_ATTACH=y
63-
# CONFIG_USELIB is not set
6463
CONFIG_AUDIT=y
6564
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
6665
CONFIG_AUDITSYSCALL=y
@@ -336,6 +335,7 @@ CONFIG_KEXEC_SIG=y
336335
# CONFIG_KEXEC_SIG_FORCE is not set
337336
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
338337
CONFIG_KEXEC_JUMP=y
338+
# CONFIG_KEXEC_HANDOVER is not set
339339
CONFIG_CRASH_DUMP=y
340340
CONFIG_CRASH_HOTPLUG=y
341341
CONFIG_CRASH_MAX_MEMORY_RANGES=8192
@@ -529,6 +529,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
529529
CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y
530530
CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y
531531
CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y
532+
CONFIG_ARCH_SUPPORTS_KEXEC_HANDOVER=y
532533
CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
533534
CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
534535
CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y
@@ -2784,6 +2785,7 @@ CONFIG_AD525X_DPOT_SPI=m
27842785
CONFIG_IBM_ASM=m
27852786
CONFIG_PHANTOM=m
27862787
CONFIG_RPMB=m
2788+
# CONFIG_TI_FPC202 is not set
27872789
CONFIG_TIFM_CORE=m
27882790
CONFIG_TIFM_7XX1=m
27892791
CONFIG_ICS932S401=m
@@ -3218,6 +3220,7 @@ CONFIG_BONDING=m
32183220
CONFIG_DUMMY=m
32193221
CONFIG_WIREGUARD=m
32203222
# CONFIG_WIREGUARD_DEBUG is not set
3223+
# CONFIG_OVPN is not set
32213224
CONFIG_EQUALIZER=m
32223225
CONFIG_NET_FC=y
32233226
CONFIG_IFB=m
@@ -8266,7 +8269,7 @@ CONFIG_HID_THRUSTMASTER=m
82668269
CONFIG_THRUSTMASTER_FF=y
82678270
CONFIG_HID_UDRAW_PS3=m
82688271
CONFIG_HID_U2FZERO=m
8269-
# CONFIG_HID_UNIVERSAL_PIDFF is not set
8272+
CONFIG_HID_UNIVERSAL_PIDFF=m
82708273
CONFIG_HID_WACOM=m
82718274
CONFIG_HID_WIIMOTE=m
82728275
CONFIG_HID_WINWING=m
@@ -9167,6 +9170,7 @@ CONFIG_DMA_ENGINE=y
91679170
CONFIG_DMA_VIRTUAL_CHANNELS=y
91689171
CONFIG_DMA_ACPI=y
91699172
CONFIG_ALTERA_MSGDMA=m
9173+
# CONFIG_ARM_DMA350 is not set
91709174
CONFIG_INTEL_IDMA64=m
91719175
CONFIG_INTEL_IDXD_BUS=m
91729176
CONFIG_INTEL_IDXD=m
@@ -11464,7 +11468,6 @@ CONFIG_CRYPTO_SHA1=y
1146411468
CONFIG_CRYPTO_SHA256=y
1146511469
CONFIG_CRYPTO_SHA512=y
1146611470
CONFIG_CRYPTO_SHA3=y
11467-
CONFIG_CRYPTO_SM3=m
1146811471
CONFIG_CRYPTO_SM3_GENERIC=m
1146911472
CONFIG_CRYPTO_STREEBOG=m
1147011473
CONFIG_CRYPTO_WP512=m
@@ -11667,6 +11670,7 @@ CONFIG_CRYPTO_LIB_POLY1305=m
1166711670
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
1166811671
CONFIG_CRYPTO_LIB_SHA1=y
1166911672
CONFIG_CRYPTO_LIB_SHA256=y
11673+
CONFIG_CRYPTO_LIB_SM3=m
1167011674
# end of Crypto library routines
1167111675

1167211676
CONFIG_CRC_CCITT=y

python/lib/kernel.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,15 @@ def prepare_source(base_name, base_ref='origin/master'):
103103
# https://lore.kernel.org/20250317174840.GA1451320@ax162/
104104
commits.append('792b2809cfc22e27b4e6616a8bcfab017773de82') # Partially revert "kunit/fortify: Replace "volatile" with OPTIMIZER_HIDE_VAR()"
105105

106-
# https://lore.kernel.org/20250415223454.GA1852104@ax162/
107-
patches.append('https://git.kernel.org/vfs/vfs/p/846e0653f594d09a5e9f1ae774ffad47fb19e817') # net, pidfd: report EINVAL for ESRCH
106+
# https://lore.kernel.org/aAeosU3V02vWxD7Z@LouisNoVo/
107+
reverts.append('0fcad44a86bdc2b5f202d91ba1eeeee6fceb7b25') # bnxt_en: Change FW message timeout warning
108108

109109
if base_name == 'linux-next-llvm':
110110
patches.append('https://lore.kernel.org/all/[email protected]/') # x86/boot/startup: Disable LTO
111+
112+
if base_name in NEXT_TREES:
113+
# https://lore.kernel.org/20250422201241.GA3761951@ax162/
114+
commits.append('ccd1a88b54f698f5e930220fedc4e708b74e5c49') # REPORTED: fixup! ocfs2: fix panic in failed foilio allocation
111115
# yapf: enable
112116

113117
try:

0 commit comments

Comments
 (0)