Skip to content

Commit 0b34d64

Browse files
committed
env: Update for next-20250423
Signed-off-by: Nathan Chancellor <[email protected]>
1 parent f0f00bd commit 0b34d64

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

configs/kernel/linux-next-llvm.config

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Automatically generated file; DO NOT EDIT.
33
# 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 c7ea01b8a0382c21da1f64a9bf077c951096db8e)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 21.0.0git (https://github.com/llvm/llvm-project.git 122e5151ba84560de824d46f7b636502d41f2aa0)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=210000
@@ -5549,6 +5549,7 @@ CONFIG_SENSORS_IRPS5401=m
55495549
CONFIG_SENSORS_ISL68137=m
55505550
CONFIG_SENSORS_LM25066=m
55515551
CONFIG_SENSORS_LM25066_REGULATOR=y
5552+
# CONFIG_SENSORS_LT3074 is not set
55525553
CONFIG_SENSORS_LT7182S=m
55535554
CONFIG_SENSORS_LTC2978=m
55545555
# CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -6550,7 +6551,6 @@ CONFIG_VIDEO_RP1_CFE=m
65506551
#
65516552
# Sunxi media platform drivers
65526553
#
6553-
# CONFIG_VIDEO_SYNOPSYS_HDMIRX is not set
65546554

65556555
#
65566556
# Texas Instruments drivers
@@ -8097,6 +8097,7 @@ CONFIG_SND_SOC_WM8962=m
80978097
CONFIG_SND_SOC_WM8974=m
80988098
CONFIG_SND_SOC_WM8978=m
80998099
CONFIG_SND_SOC_WM8985=m
8100+
# CONFIG_SND_SOC_WM8998 is not set
81008101
CONFIG_SND_SOC_WSA881X=m
81018102
CONFIG_SND_SOC_WSA883X=m
81028103
CONFIG_SND_SOC_WSA884X=m
@@ -10864,6 +10865,7 @@ CONFIG_BCACHEFS_LOCK_TIME_STATS=y
1086410865
# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
1086510866
CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
1086610867
# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
10868+
CONFIG_BCACHEFS_ASYNC_OBJECT_LISTS=y
1086710869
CONFIG_ZONEFS_FS=m
1086810870
CONFIG_FS_DAX=y
1086910871
CONFIG_FS_DAX_PMD=y

python/lib/kernel.py

+32-2
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,41 @@ def prepare_source(base_name, base_ref='origin/master'):
107107
reverts.append('0fcad44a86bdc2b5f202d91ba1eeeee6fceb7b25') # bnxt_en: Change FW message timeout warning
108108

109109
if base_name == 'linux-next-llvm':
110-
patches.append('https://lore.kernel.org/all/[email protected]/') # x86/boot/startup: Disable LTO
110+
patches.append('https://git.kernel.org/tip/tip/p/498cb872a111e25021ca5e2d91af7b7a2e62630f') # x86/boot/startup: Disable LTO
111111

112112
if base_name in NEXT_TREES:
113113
# https://lore.kernel.org/20250422201241.GA3761951@ax162/
114-
commits.append('ccd1a88b54f698f5e930220fedc4e708b74e5c49') # REPORTED: fixup! ocfs2: fix panic in failed foilio allocation
114+
commits.append('ccd1a88b54f698f5e930220fedc4e708b74e5c49') # fixup! ocfs2: fix panic in failed foilio allocation
115+
116+
# https://lore.kernel.org/[email protected]/
117+
patches.append('''\
118+
From 7d108a4cfec73985bf907558a0111fbbb7cc0c79 Mon Sep 17 00:00:00 2001
119+
From: Nathan Chancellor <[email protected]>
120+
Date: Wed, 23 Apr 2025 14:18:43 -0700
121+
Subject: [PATCH] fixup! ratelimit: Allow zero ->burst to disable ratelimiting
122+
123+
Signed-off-by: Nathan Chancellor <[email protected]>
124+
---
125+
lib/ratelimit.c | 2 +-
126+
1 file changed, 1 insertion(+), 1 deletion(-)
127+
128+
diff --git a/lib/ratelimit.c b/lib/ratelimit.c
129+
index b5c727e976d2..14dfada96a4a 100644
130+
--- a/lib/ratelimit.c
131+
+++ b/lib/ratelimit.c
132+
@@ -40,7 +40,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func)
133+
* interval says never limit.
134+
*/
135+
if (interval <= 0 || burst <= 0) {
136+
- ret = burst > 0;
137+
+ ret = interval == 0 || burst > 0;
138+
if (!(READ_ONCE(rs->flags) & RATELIMIT_INITIALIZED) ||
139+
!raw_spin_trylock_irqsave(&rs->lock, flags))
140+
return ret;
141+
--
142+
2.49.0
143+
144+
''') # noqa: E101, W291
115145
# yapf: enable
116146

117147
try:

0 commit comments

Comments
 (0)