Skip to content

Commit 32d3191

Browse files
committed
env: Update for next-20241216
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 5d30ec3 commit 32d3191

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

configs/kernel/linux-next-llvm.config

Lines changed: 4 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 6.13.0-rc2 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 20.0.0git (https://github.com/llvm/llvm-project.git 3133acf1fbd1cc57ea8e74288ee9a0acd027d749)"
5+
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 20.0.0git (https://github.com/llvm/llvm-project.git 8476ba71f20a6c260c8b55822ce02db45f8252be)"
66
CONFIG_GCC_VERSION=0
77
CONFIG_CC_IS_CLANG=y
88
CONFIG_CLANG_VERSION=200000
@@ -21,7 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24-
CONFIG_PAHOLE_VERSION=127
24+
CONFIG_PAHOLE_VERSION=128
2525
CONFIG_IRQ_WORK=y
2626
CONFIG_BUILDTIME_TABLE_SORT=y
2727
CONFIG_THREAD_INFO_IN_TASK=y
@@ -211,6 +211,7 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5
211211
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
212212
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
213213
CONFIG_CC_HAS_INT128=y
214+
CONFIG_CC_HAS_TYPEOF_UNQUAL=y
214215
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough"
215216
CONFIG_GCC10_NO_ARRAY_BOUNDS=y
216217
CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
@@ -5913,6 +5914,7 @@ CONFIG_RAVE_SP_CORE=m
59135914
CONFIG_MFD_INTEL_M10_BMC_CORE=m
59145915
CONFIG_MFD_INTEL_M10_BMC_SPI=m
59155916
CONFIG_MFD_INTEL_M10_BMC_PMCI=m
5917+
# CONFIG_MFD_UPBOARD_FPGA is not set
59165918
# end of Multifunction device drivers
59175919

59185920
CONFIG_REGULATOR=y

python/lib/kernel.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,26 @@ def prepare_source(base_name, base_ref='origin/master'):
9494
# https://lore.kernel.org/20241114163931.GA1928968@thelio-3990X/
9595
commits.append('bd0601e8f99ded716ae1341c39cf8cc30fc28466') # fixup! netfs: Change the read result collector to only use one work item
9696

97+
if base_name in ('fedora', 'rpi'):
98+
# https://lore.kernel.org/20241216180231.GA1069997@ax162/
99+
reverts.append('ce8fd0500b741b3669c246cc604f1f2343cdd6fd') # crypto: qce - use __free() for a buffer that's always freed
100+
101+
if base_name == 'fedora':
102+
patches.append('https://lore.kernel.org/all/20241216093410.377112-1-arnd@kernel.org/') # ALSA: compress_offload: import DMA_BUF namespace
103+
97104
if base_name == 'linux-next-llvm':
98105
# https://lore.kernel.org/20241212014418.GA532802@ax162/
99-
patches.append('https://lore.kernel.org/all/ed7dd45f89e8f286478791137447a21d53735dbd.camel@infradead.org/') # [PATCH] x86/kexec: Disable global pages before writing to control page
100-
patches.append('https://lore.kernel.org/all/20241213-kexec-fix-section-name-for-ffunction-sections-v1-1-1ae6050f6a15@kernel.org/') # x86/kexec: Fix location of relocate_kernel with -ffunction-sections
101-
patches.append('https://lore.kernel.org/all/20241214230818.GA677337@ax162/') # possible fixup for "x86/kexec: Invoke copy of relocate_kernel() instead of the original"
106+
# https://lore.kernel.org/all/20241213-kexec-fix-section-name-for-ffunction-sections-v1-1-1ae6050f6a15@kernel.org/
107+
# https://lore.kernel.org/20241214230818.GA677337@ax162/
108+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=fb5545a138533a20272000e3c9f72d43bb84dc35') # x86/kexec: Disable global pages before writing to control page
109+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=ee1699ce2970adcc6dd442508b58101fee57818f') # x86/kexec: Ensure preserve_context flag is set on return to kernel
110+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=cf39347122d9a46bf6bd94d3dfec72f9711e96de') # x86/kexec: Use correct swap page in swap_pages function
111+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=0d2acc7d17b140b3ed61c28f530fc110082b2963') # x86/kexec: Fix stack and handling of re-entry point for ::preserve_context
112+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=a04ce0a6c84ce121b5a8dc4fc5340a0bc998cb24') # x86/kexec: Fix location of relocate_kernel with -ffunction-sections
113+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=373fadb62a6c7d0c6d69cb19b35120ab539af2ef') # x86/kexec: Cope with relocate_kernel() not being at the start of the page
114+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=0a5ebf841693b0b48d1012dc85d8f391815b72ea') # x86/kexec: Add CFI type information to relocate_kernel()
115+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=759535da6ae8da013c2bb8b6ddebca84fa4f69d3') # x86/kexec: Invalidate GDT/IDT from relocate_kernel() instead of earlier
116+
patches.append('https://git.infradead.org/?p=users/dwmw2/linux.git;a=patch;h=39aa20cecfdc40f4c63d285227d139d1f314a43d') # x86/kexec: Use typedef for relocate_kernel_fn function prototype
102117
# yapf: enable
103118

104119
try:

0 commit comments

Comments
 (0)