Skip to content

Commit 95c3366

Browse files
nathanchancenathanchance
committed
env: Update for next-20260325
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 2c1e9b4 commit 95c3366

File tree

3 files changed

+39
-52
lines changed

3 files changed

+39
-52
lines changed

‎configs/kernel/fedora-arm64.config‎

Lines changed: 21 additions & 33 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 caf619642a6dbb216969a9450d33dbac5a8d30df)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git feae3bc202cedbc1e83201eb8ea147f1a7729cd3)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=230000
@@ -2778,12 +2778,6 @@ CONFIG_ZRAM_WRITEBACK=y
27782778
CONFIG_ZRAM_MULTI_COMP=y
27792779
CONFIG_BLK_DEV_LOOP=m
27802780
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
2781-
CONFIG_BLK_DEV_DRBD=m
2782-
# CONFIG_DRBD_FAULT_INJECTION is not set
2783-
CONFIG_BLK_DEV_DRBD_TCP=m
2784-
# CONFIG_BLK_DEV_DRBD_LB_TCP is not set
2785-
# CONFIG_BLK_DEV_DRBD_RDMA is not set
2786-
CONFIG_DRBD_COMPAT_84=y
27872781
CONFIG_BLK_DEV_NBD=m
27882782
CONFIG_BLK_DEV_RAM=m
27892783
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -4976,6 +4970,7 @@ CONFIG_GPIO_IDIO_16=m
49764970
# CONFIG_GPIO_74XX_MMIO is not set
49774971
# CONFIG_GPIO_ALTERA is not set
49784972
# CONFIG_GPIO_AMDPT is not set
4973+
# CONFIG_GPIO_BY_PINCTRL is not set
49794974
CONFIG_GPIO_CADENCE=m
49804975
CONFIG_GPIO_DWAPB=m
49814976
CONFIG_GPIO_EXAR=m
@@ -10494,6 +10489,8 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
1049410489
CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
1049510490
CONFIG_AMPERE_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
1049610491
CONFIG_CXL_PMU=m
10492+
# CONFIG_NVIDIA_TEGRA410_CMEM_LATENCY_PMU is not set
10493+
# CONFIG_NVIDIA_TEGRA410_C2C_PMU is not set
1049710494
# end of Performance monitor support
1049810495

1049910496
CONFIG_RAS=y
@@ -11299,7 +11296,7 @@ CONFIG_CRYPTO_SHA1=y
1129911296
CONFIG_CRYPTO_SHA256=y
1130011297
CONFIG_CRYPTO_SHA512=y
1130111298
CONFIG_CRYPTO_SHA3=y
11302-
# CONFIG_CRYPTO_SM3_GENERIC is not set
11299+
# CONFIG_CRYPTO_SM3 is not set
1130311300
CONFIG_CRYPTO_STREEBOG=m
1130411301
CONFIG_CRYPTO_WP512=m
1130511302
CONFIG_CRYPTO_XCBC=m
@@ -11361,8 +11358,6 @@ CONFIG_CRYPTO_USER_API_AEAD=y
1136111358
# Accelerated Cryptographic Algorithms for CPU (arm64)
1136211359
#
1136311360
CONFIG_CRYPTO_GHASH_ARM64_CE=m
11364-
# CONFIG_CRYPTO_SM3_NEON is not set
11365-
# CONFIG_CRYPTO_SM3_ARM64_CE is not set
1136611361
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
1136711362
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
1136811363
CONFIG_CRYPTO_AES_ARM64_BS=m
@@ -11496,10 +11491,6 @@ CONFIG_CRC_OPTIMIZATIONS=y
1149611491
CONFIG_CRC_KUNIT_TEST=m
1149711492
# CONFIG_CRC_ENABLE_ALL_FOR_KUNIT is not set
1149811493
# CONFIG_CRC_BENCHMARK is not set
11499-
11500-
#
11501-
# Crypto library routines
11502-
#
1150311494
CONFIG_CRYPTO_HASH_INFO=y
1150411495
CONFIG_CRYPTO_LIB_UTILS=y
1150511496
CONFIG_CRYPTO_LIB_AES=y
@@ -11532,24 +11523,6 @@ CONFIG_CRYPTO_LIB_SHA512=y
1153211523
CONFIG_CRYPTO_LIB_SHA512_ARCH=y
1153311524
CONFIG_CRYPTO_LIB_SHA3=y
1153411525
CONFIG_CRYPTO_LIB_SHA3_ARCH=y
11535-
CONFIG_CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST=m
11536-
CONFIG_CRYPTO_LIB_BLAKE2B_KUNIT_TEST=m
11537-
CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=m
11538-
CONFIG_CRYPTO_LIB_CURVE25519_KUNIT_TEST=m
11539-
CONFIG_CRYPTO_LIB_GHASH_KUNIT_TEST=m
11540-
CONFIG_CRYPTO_LIB_MD5_KUNIT_TEST=m
11541-
CONFIG_CRYPTO_LIB_NH_KUNIT_TEST=m
11542-
CONFIG_CRYPTO_LIB_POLY1305_KUNIT_TEST=m
11543-
CONFIG_CRYPTO_LIB_POLYVAL_KUNIT_TEST=m
11544-
CONFIG_CRYPTO_LIB_SHA1_KUNIT_TEST=m
11545-
CONFIG_CRYPTO_LIB_SHA256_KUNIT_TEST=m
11546-
CONFIG_CRYPTO_LIB_SHA512_KUNIT_TEST=m
11547-
CONFIG_CRYPTO_LIB_SHA3_KUNIT_TEST=m
11548-
# CONFIG_CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT is not set
11549-
CONFIG_CRYPTO_LIB_BENCHMARK_VISIBLE=y
11550-
# CONFIG_CRYPTO_LIB_BENCHMARK is not set
11551-
# end of Crypto library routines
11552-
1155311526
CONFIG_XOR_BLOCKS=y
1155411527
CONFIG_XOR_BLOCKS_ARCH=y
1155511528
CONFIG_XOR_KUNIT_TEST=m
@@ -11646,7 +11619,6 @@ CONFIG_CPU_RMAP=y
1164611619
CONFIG_DQL=y
1164711620
CONFIG_GLOB=y
1164811621
CONFIG_NLATTR=y
11649-
CONFIG_LRU_CACHE=m
1165011622
CONFIG_CLZ_TAB=y
1165111623
CONFIG_IRQ_POLL=y
1165211624
CONFIG_MPILIB=y
@@ -12128,6 +12100,22 @@ CONFIG_OVERFLOW_KUNIT_TEST=m
1212812100
CONFIG_RANDSTRUCT_KUNIT_TEST=m
1212912101
CONFIG_STACKINIT_KUNIT_TEST=m
1213012102
CONFIG_FORTIFY_KUNIT_TEST=m
12103+
CONFIG_CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST=m
12104+
CONFIG_CRYPTO_LIB_BLAKE2B_KUNIT_TEST=m
12105+
CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=m
12106+
CONFIG_CRYPTO_LIB_CURVE25519_KUNIT_TEST=m
12107+
CONFIG_CRYPTO_LIB_GHASH_KUNIT_TEST=m
12108+
CONFIG_CRYPTO_LIB_MD5_KUNIT_TEST=m
12109+
CONFIG_CRYPTO_LIB_NH_KUNIT_TEST=m
12110+
CONFIG_CRYPTO_LIB_POLY1305_KUNIT_TEST=m
12111+
CONFIG_CRYPTO_LIB_POLYVAL_KUNIT_TEST=m
12112+
CONFIG_CRYPTO_LIB_SHA1_KUNIT_TEST=m
12113+
CONFIG_CRYPTO_LIB_SHA256_KUNIT_TEST=m
12114+
CONFIG_CRYPTO_LIB_SHA512_KUNIT_TEST=m
12115+
CONFIG_CRYPTO_LIB_SHA3_KUNIT_TEST=m
12116+
# CONFIG_CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT is not set
12117+
CONFIG_CRYPTO_LIB_BENCHMARK_VISIBLE=y
12118+
# CONFIG_CRYPTO_LIB_BENCHMARK is not set
1213112119
CONFIG_SIPHASH_KUNIT_TEST=m
1213212120
CONFIG_USERCOPY_KUNIT_TEST=m
1213312121
CONFIG_BLACKHOLE_DEV_KUNIT_TEST=m

‎configs/kernel/linux-next-llvm.config‎

Lines changed: 4 additions & 17 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 caf619642a6dbb216969a9450d33dbac5a8d30df)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 23.0.0git (https://github.com/llvm/llvm-project.git feae3bc202cedbc1e83201eb8ea147f1a7729cd3)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=230000
@@ -2807,12 +2807,6 @@ CONFIG_ZRAM_MEMORY_TRACKING=y
28072807
CONFIG_ZRAM_MULTI_COMP=y
28082808
CONFIG_BLK_DEV_LOOP=m
28092809
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
2810-
CONFIG_BLK_DEV_DRBD=m
2811-
# CONFIG_DRBD_FAULT_INJECTION is not set
2812-
CONFIG_BLK_DEV_DRBD_TCP=m
2813-
# CONFIG_BLK_DEV_DRBD_LB_TCP is not set
2814-
# CONFIG_BLK_DEV_DRBD_RDMA is not set
2815-
CONFIG_DRBD_COMPAT_84=y
28162810
CONFIG_BLK_DEV_NBD=m
28172811
CONFIG_BLK_DEV_RAM=m
28182812
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -5262,6 +5256,7 @@ CONFIG_GPIO_IDIO_16=m
52625256
#
52635257
CONFIG_GPIO_ALTERA=m
52645258
CONFIG_GPIO_AMDPT=m
5259+
# CONFIG_GPIO_BY_PINCTRL is not set
52655260
CONFIG_GPIO_DWAPB=m
52665261
CONFIG_GPIO_EXAR=m
52675262
CONFIG_GPIO_GENERIC_PLATFORM=m
@@ -9866,6 +9861,7 @@ CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
98669861
CONFIG_XIAOMI_WMI=m
98679862
CONFIG_REDMI_WMI=m
98689863
CONFIG_GIGABYTE_WMI=m
9864+
# CONFIG_BITLAND_MIFS_WMI is not set
98699865
CONFIG_ACERHDF=m
98709866
CONFIG_ACER_WIRELESS=m
98719867
CONFIG_ACER_WMI=m
@@ -11905,7 +11901,7 @@ CONFIG_CRYPTO_SHA1=y
1190511901
CONFIG_CRYPTO_SHA256=y
1190611902
CONFIG_CRYPTO_SHA512=y
1190711903
CONFIG_CRYPTO_SHA3=y
11908-
CONFIG_CRYPTO_SM3_GENERIC=m
11904+
# CONFIG_CRYPTO_SM3 is not set
1190911905
CONFIG_CRYPTO_STREEBOG=m
1191011906
CONFIG_CRYPTO_WP512=m
1191111907
CONFIG_CRYPTO_XCBC=m
@@ -11981,7 +11977,6 @@ CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64=m
1198111977
CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64=m
1198211978
CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64=m
1198311979
CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
11984-
CONFIG_CRYPTO_SM3_AVX_X86_64=m
1198511980
# end of Accelerated Cryptographic Algorithms for CPU (x86)
1198611981

1198711982
CONFIG_CRYPTO_HW=y
@@ -12083,10 +12078,6 @@ CONFIG_CRC32_ARCH=y
1208312078
CONFIG_CRC64=y
1208412079
CONFIG_CRC64_ARCH=y
1208512080
CONFIG_CRC_OPTIMIZATIONS=y
12086-
12087-
#
12088-
# Crypto library routines
12089-
#
1209012081
CONFIG_CRYPTO_HASH_INFO=y
1209112082
CONFIG_CRYPTO_LIB_UTILS=y
1209212083
CONFIG_CRYPTO_LIB_AES=y
@@ -12121,9 +12112,6 @@ CONFIG_CRYPTO_LIB_SHA256_ARCH=y
1212112112
CONFIG_CRYPTO_LIB_SHA512=y
1212212113
CONFIG_CRYPTO_LIB_SHA512_ARCH=y
1212312114
CONFIG_CRYPTO_LIB_SHA3=y
12124-
CONFIG_CRYPTO_LIB_SM3=m
12125-
# end of Crypto library routines
12126-
1212712115
CONFIG_XOR_BLOCKS=y
1212812116
CONFIG_XOR_BLOCKS_ARCH=y
1212912117
CONFIG_XXHASH=y
@@ -12208,7 +12196,6 @@ CONFIG_CPU_RMAP=y
1220812196
CONFIG_DQL=y
1220912197
CONFIG_GLOB=y
1221012198
CONFIG_NLATTR=y
12211-
CONFIG_LRU_CACHE=m
1221212199
CONFIG_CLZ_TAB=y
1221312200
CONFIG_IRQ_POLL=y
1221412201
CONFIG_MPILIB=y

‎python/lib/kernel.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,16 @@ def prepare_source(base_name, base_ref='origin/master'):
103103
commits = []
104104

105105
# Patching section
106-
# fmt: off
107-
# fmt: on
106+
patches.append(
107+
'https://lore.kernel.org/all/20260325-modpost-extra_warn-unused-but-set-global-v1-1-2e84003b7e81@kernel.org/'
108+
) # modpost: Declare extra_warn with unused attribute
109+
patches.append(
110+
'https://lore.kernel.org/all/20260325-certs-extract-cert-key_pass-unused-but-set-global-v1-1-ecf94326d532@kernel.org/'
111+
) # extract-cert: Wrap key_pass with '#ifdef USE_PKCS11_ENGINE'
112+
if base_name == 'fedora':
113+
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
108116

109117
try:
110118
for revert in reverts:
@@ -141,6 +149,10 @@ def prepare_source(base_name, base_ref='origin/master'):
141149
am_cmd.append(patch)
142150
elif patch.startswith('https://lore.kernel.org/') and not patch.endswith('/raw'):
143151
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']
144156
elif patch.startswith(('https://', 'http://')):
145157
# curl is banned due to bot attacks
146158
fetch_func = lib.utils.wget if 'lore.kernel.org' in patch else lib.utils.curl

0 commit comments

Comments
 (0)