Skip to content

Commit 83ff492

Browse files
committed
env: Update for next-20260327
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent becdb7b commit 83ff492

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

configs/kernel/fedora-arm64.config

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Automatically generated file; DO NOT EDIT.
33
# Linux/arm64 7.0.0-rc5 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git feae3bc202cedbc1e83201eb8ea147f1a7729cd3)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git 8e2a5e37eaf638c536dd71cb685843e8cb2aed2c)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=230000
@@ -236,6 +236,7 @@ CONFIG_SOCK_CGROUP_DATA=y
236236
CONFIG_NAMESPACES=y
237237
CONFIG_UTS_NS=y
238238
CONFIG_TIME_NS=y
239+
CONFIG_TIME_NS_VDSO=y
239240
CONFIG_IPC_NS=y
240241
CONFIG_USER_NS=y
241242
CONFIG_PID_NS=y
@@ -619,6 +620,14 @@ CONFIG_ARM64_HAFT=y
619620
CONFIG_ARM64_GCS=y
620621
# end of ARMv9.4 architectural features
621622

623+
CONFIG_AS_HAS_LSUI=y
624+
625+
#
626+
# ARMv9.6 architectural features
627+
#
628+
CONFIG_ARM64_LSUI=y
629+
# end of ARMv9.6 architectural features
630+
622631
CONFIG_ARM64_SVE=y
623632
CONFIG_ARM64_SME=y
624633
CONFIG_ARM64_PSEUDO_NMI=y
@@ -2573,6 +2582,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y
25732582
# end of Firmware Drivers
25742583

25752584
CONFIG_FWCTL=m
2585+
# CONFIG_FWCTL_BNXT is not set
25762586
CONFIG_FWCTL_MLX5=m
25772587
CONFIG_FWCTL_PDS=m
25782588
CONFIG_GNSS=m
@@ -2778,6 +2788,8 @@ CONFIG_ZRAM_WRITEBACK=y
27782788
CONFIG_ZRAM_MULTI_COMP=y
27792789
CONFIG_BLK_DEV_LOOP=m
27802790
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
2791+
CONFIG_BLK_DEV_DRBD=m
2792+
# CONFIG_DRBD_FAULT_INJECTION is not set
27812793
CONFIG_BLK_DEV_NBD=m
27822794
CONFIG_BLK_DEV_RAM=m
27832795
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -2797,6 +2809,7 @@ CONFIG_BLK_DEV_ZONED_LOOP=m
27972809
#
27982810
CONFIG_NVME_KEYRING=m
27992811
CONFIG_NVME_AUTH=m
2812+
CONFIG_NVME_AUTH_KUNIT_TEST=m
28002813
CONFIG_NVME_CORE=m
28012814
CONFIG_BLK_DEV_NVME=m
28022815
CONFIG_NVME_MULTIPATH=y
@@ -6441,6 +6454,7 @@ CONFIG_VIDEO_OV2640=m
64416454
CONFIG_VIDEO_OV2659=m
64426455
CONFIG_VIDEO_OV2680=m
64436456
CONFIG_VIDEO_OV2685=m
6457+
# CONFIG_VIDEO_OV2732 is not set
64446458
CONFIG_VIDEO_OV2735=m
64456459
CONFIG_VIDEO_OV2740=m
64466460
CONFIG_VIDEO_OV4689=m
@@ -6474,6 +6488,7 @@ CONFIG_VIDEO_S5K3M5=m
64746488
CONFIG_VIDEO_S5K5BAF=m
64756489
CONFIG_VIDEO_S5K6A3=m
64766490
CONFIG_VIDEO_S5KJN1=m
6491+
# CONFIG_VIDEO_T4KA3 is not set
64776492
CONFIG_VIDEO_VD55G1=m
64786493
CONFIG_VIDEO_VD56G3=m
64796494
# CONFIG_VIDEO_VGXY61 is not set
@@ -7072,12 +7087,14 @@ CONFIG_DRM_PANEL_HIMAX_HX8279=m
70727087
CONFIG_DRM_PANEL_HIMAX_HX83102=m
70737088
# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
70747089
CONFIG_DRM_PANEL_HIMAX_HX83112B=m
7090+
# CONFIG_DRM_PANEL_HIMAX_HX83121A is not set
70757091
CONFIG_DRM_PANEL_HIMAX_HX8394=m
70767092
CONFIG_DRM_PANEL_HYDIS_HV101HD1=m
70777093
CONFIG_DRM_PANEL_ILITEK_IL9322=m
70787094
CONFIG_DRM_PANEL_ILITEK_ILI9341=m
70797095
# CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
7080-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
7096+
# CONFIG_DRM_PANEL_ILITEK_ILI9806E_DSI is not set
7097+
# CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI is not set
70817098
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
70827099
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
70837100
CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
@@ -7144,6 +7161,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
71447161
# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
71457162
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
71467163
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA5X01_AMS561RA01=m
7164+
# CONFIG_DRM_PANEL_SAMSUNG_S6E8FC0 is not set
71477165
CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=m
71487166
CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
71497167
CONFIG_DRM_PANEL_SHARP_LQ079L1SX01=m
@@ -7842,6 +7860,7 @@ CONFIG_SND_SOC_CS35L56_SDW=m
78427860
#
78437861
# CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS is not set
78447862
# CONFIG_SND_SOC_CS35L56_CAL_SET_CTRL is not set
7863+
# CONFIG_SND_SOC_CS35L56_CAL_PERFORM_CTRL is not set
78457864
CONFIG_SND_SOC_CS35L56_TEST=m
78467865
CONFIG_SND_SOC_CS35L56_SHARED_TEST=m
78477866
# end of CS35L56 driver options
@@ -10345,6 +10364,7 @@ CONFIG_SX9360=m
1034510364
# CONFIG_SRF08 is not set
1034610365
CONFIG_VCNL3020=m
1034710366
CONFIG_VL53L0X_I2C=m
10367+
# CONFIG_VL53L1X_I2C is not set
1034810368
# CONFIG_AW96103 is not set
1034910369
# end of Proximity and distance sensors
1035010370

@@ -11205,7 +11225,6 @@ CONFIG_CRYPTO_AKCIPHER=y
1120511225
CONFIG_CRYPTO_KPP2=y
1120611226
CONFIG_CRYPTO_KPP=y
1120711227
CONFIG_CRYPTO_ACOMP2=y
11208-
CONFIG_CRYPTO_HKDF=m
1120911228
CONFIG_CRYPTO_MANAGER=y
1121011229
CONFIG_CRYPTO_MANAGER2=y
1121111230
CONFIG_CRYPTO_USER=m
@@ -11619,6 +11638,7 @@ CONFIG_CPU_RMAP=y
1161911638
CONFIG_DQL=y
1162011639
CONFIG_GLOB=y
1162111640
CONFIG_NLATTR=y
11641+
CONFIG_LRU_CACHE=m
1162211642
CONFIG_CLZ_TAB=y
1162311643
CONFIG_IRQ_POLL=y
1162411644
CONFIG_MPILIB=y

configs/kernel/linux-next-llvm.config

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Automatically generated file; DO NOT EDIT.
33
# Linux/x86_64 7.0.0-rc5 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git feae3bc202cedbc1e83201eb8ea147f1a7729cd3)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git 8e2a5e37eaf638c536dd71cb685843e8cb2aed2c)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=230000
@@ -264,6 +264,7 @@ CONFIG_SOCK_CGROUP_DATA=y
264264
CONFIG_NAMESPACES=y
265265
CONFIG_UTS_NS=y
266266
CONFIG_TIME_NS=y
267+
CONFIG_TIME_NS_VDSO=y
267268
CONFIG_IPC_NS=y
268269
CONFIG_USER_NS=y
269270
CONFIG_PID_NS=y
@@ -2623,6 +2624,7 @@ CONFIG_QCOM_TZMEM_MODE_GENERIC=y
26232624
# end of Firmware Drivers
26242625

26252626
CONFIG_FWCTL=m
2627+
# CONFIG_FWCTL_BNXT is not set
26262628
CONFIG_FWCTL_MLX5=m
26272629
CONFIG_FWCTL_PDS=m
26282630
CONFIG_GNSS=m
@@ -2807,6 +2809,8 @@ CONFIG_ZRAM_MEMORY_TRACKING=y
28072809
CONFIG_ZRAM_MULTI_COMP=y
28082810
CONFIG_BLK_DEV_LOOP=m
28092811
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
2812+
CONFIG_BLK_DEV_DRBD=m
2813+
# CONFIG_DRBD_FAULT_INJECTION is not set
28102814
CONFIG_BLK_DEV_NBD=m
28112815
CONFIG_BLK_DEV_RAM=m
28122816
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -6878,6 +6882,7 @@ CONFIG_VIDEO_S5C73M3=m
68786882
CONFIG_VIDEO_S5K5BAF=m
68796883
CONFIG_VIDEO_S5K6A3=m
68806884
# CONFIG_VIDEO_S5KJN1 is not set
6885+
# CONFIG_VIDEO_T4KA3 is not set
68816886
CONFIG_VIDEO_VD55G1=m
68826887
CONFIG_VIDEO_VD56G3=m
68836888
CONFIG_VIDEO_CCS=m
@@ -8198,6 +8203,7 @@ CONFIG_SND_SOC_CS35L56_SDW=m
81988203
#
81998204
# CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS is not set
82008205
# CONFIG_SND_SOC_CS35L56_CAL_SET_CTRL is not set
8206+
# CONFIG_SND_SOC_CS35L56_CAL_PERFORM_CTRL is not set
82018207
# end of CS35L56 driver options
82028208

82038209
CONFIG_SND_SOC_CS40L50=m
@@ -10989,6 +10995,7 @@ CONFIG_SX9500=m
1098910995
CONFIG_SRF08=m
1099010996
CONFIG_VCNL3020=m
1099110997
CONFIG_VL53L0X_I2C=m
10998+
# CONFIG_VL53L1X_I2C is not set
1099210999
CONFIG_AW96103=m
1099311000
# end of Proximity and distance sensors
1099411001

@@ -11812,7 +11819,6 @@ CONFIG_CRYPTO_AKCIPHER=y
1181211819
CONFIG_CRYPTO_KPP2=y
1181311820
CONFIG_CRYPTO_KPP=y
1181411821
CONFIG_CRYPTO_ACOMP2=y
11815-
CONFIG_CRYPTO_HKDF=m
1181611822
CONFIG_CRYPTO_MANAGER=y
1181711823
CONFIG_CRYPTO_MANAGER2=y
1181811824
CONFIG_CRYPTO_USER=m
@@ -12196,6 +12202,7 @@ CONFIG_CPU_RMAP=y
1219612202
CONFIG_DQL=y
1219712203
CONFIG_GLOB=y
1219812204
CONFIG_NLATTR=y
12205+
CONFIG_LRU_CACHE=m
1219912206
CONFIG_CLZ_TAB=y
1220012207
CONFIG_IRQ_POLL=y
1220112208
CONFIG_MPILIB=y

python/lib/kernel.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ def prepare_source(base_name, base_ref='origin/master'):
111111
) # extract-cert: Wrap key_pass with '#ifdef USE_PKCS11_ENGINE'
112112
if base_name == 'fedora':
113113
patches.append(
114-
'https://lore.kernel.org/all/20260325-dtc-lexer-remove-dts_version-v1-1-0b5d64903bbb@kernel.org/'
115-
) # dtc: Remove unused dts_version in dtc-lexer.l
114+
'https://lore.kernel.org/all/20260327-dtc-drop-dts_version-v1-1-41066690aefd@kernel.org/'
115+
) # scripts/dtc: Remove unused dts_version in dtc-lexer.l
116116

117117
try:
118118
for revert in reverts:
@@ -149,10 +149,6 @@ def prepare_source(base_name, base_ref='origin/master'):
149149
am_cmd.append(patch)
150150
elif patch.startswith('https://lore.kernel.org/') and not patch.endswith('/raw'):
151151
am_kwargs['input'] = b4_am_o(patch)
152-
if 'dtc-lexer-remove-dts_version' in patch:
153-
# the patch is against upstream dtc, ensure it is applied
154-
# to the vendored path in the kernel
155-
am_cmd += ['--directory', 'scripts/dtc']
156152
elif patch.startswith(('https://', 'http://')):
157153
# curl is banned due to bot attacks
158154
fetch_func = lib.utils.wget if 'lore.kernel.org' in patch else lib.utils.curl

0 commit comments

Comments
 (0)