Skip to content

Commit

Permalink
env: Update to next-20250106
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
nathanchance committed Jan 6, 2025
1 parent 21274e4 commit 204aa14
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 23 deletions.
26 changes: 17 additions & 9 deletions configs/kernel/linux-next-llvm.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.13.0-rc3 Kernel Configuration
# Linux/x86_64 6.13.0-rc5 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 20.0.0git (https://github.com/llvm/llvm-project.git fe85c71a7b556b3cef1528399b123538e6b3dd4b)"
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 20.0.0git (https://github.com/llvm/llvm-project.git 34f0611bc36db40789823030a3748a8595198719)"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
CONFIG_CLANG_VERSION=200000
Expand Down Expand Up @@ -1187,7 +1187,10 @@ CONFIG_HAVE_BOOTMEM_INFO_NODE=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
CONFIG_MHP_DEFAULT_ONLINE_TYPE_OFFLINE=y
# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO is not set
# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_KERNEL is not set
# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_MOVABLE is not set
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_MHP_MEMMAP_ON_MEMORY=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
Expand Down Expand Up @@ -1285,7 +1288,6 @@ CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
# CONFIG_DAMON_DBGFS_DEPRECATED is not set
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
Expand Down Expand Up @@ -2504,7 +2506,7 @@ CONFIG_EFI_EMBEDDED_FIRMWARE=y

CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
# CONFIG_IMX_SCMI_MISC_DRV is not set
CONFIG_IMX_SCMI_MISC_DRV=m

#
# Qualcomm firmware drivers
Expand Down Expand Up @@ -3711,6 +3713,7 @@ CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_T1S_PHY=m
CONFIG_MICROCHIP_PHY=m
CONFIG_MICROCHIP_T1_PHY=m
CONFIG_MICROCHIP_PHY_RDS_PTP=m
CONFIG_MICROSEMI_PHY=m
CONFIG_MOTORCOMM_PHY=m
CONFIG_NATIONAL_PHY=m
Expand Down Expand Up @@ -5121,7 +5124,7 @@ CONFIG_GPIO_ADP5520=m
CONFIG_GPIO_ARIZONA=m
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_CROS_EC=m
CONFIG_GPIO_CRYSTAL_COVE=m
CONFIG_GPIO_CRYSTAL_COVE=y
CONFIG_GPIO_DA9052=m
CONFIG_GPIO_DA9055=m
CONFIG_GPIO_DLN2=m
Expand Down Expand Up @@ -5316,6 +5319,7 @@ CONFIG_CHARGER_RT9471=m
CONFIG_CHARGER_CROS_USBPD=m
CONFIG_CHARGER_CROS_PCHG=m
CONFIG_CHARGER_CROS_CONTROL=m
# CONFIG_FUEL_GAUGE_STC3117 is not set
CONFIG_CHARGER_BD99954=m
CONFIG_CHARGER_WILCO=m
CONFIG_BATTERY_SURFACE=m
Expand Down Expand Up @@ -8626,6 +8630,7 @@ CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
CONFIG_UCSI_STM32G0=m
CONFIG_CROS_EC_UCSI=m
CONFIG_TYPEC_TPS6598X=m
CONFIG_TYPEC_ANX7411=m
CONFIG_TYPEC_RT1719=m
Expand All @@ -8652,6 +8657,7 @@ CONFIG_TYPEC_MUX_WCD939X_USBSS=m
#
CONFIG_TYPEC_DP_ALTMODE=m
CONFIG_TYPEC_NVIDIA_ALTMODE=m
# CONFIG_TYPEC_TBT_ALTMODE is not set
# end of USB Type-C Alternate Mode drivers

CONFIG_USB_ROLE_SWITCH=m
Expand Down Expand Up @@ -9336,6 +9342,7 @@ CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_SENSORHUB=m
CONFIG_CROS_EC_SYSFS=m
CONFIG_CROS_EC_TYPEC_ALTMODES=y
CONFIG_CROS_EC_TYPEC=m
CONFIG_CROS_HPS_I2C=m
CONFIG_CROS_USBPD_LOGGER=m
Expand Down Expand Up @@ -10057,6 +10064,7 @@ CONFIG_AD7293=m
CONFIG_AD7303=m
# CONFIG_AD8460 is not set
CONFIG_AD8801=m
# CONFIG_BD79703 is not set
CONFIG_DPOT_DAC=m
CONFIG_DS4424=m
CONFIG_LTC1660=m
Expand Down Expand Up @@ -10252,6 +10260,7 @@ CONFIG_MAX44009=m
CONFIG_NOA1305=m
CONFIG_OPT3001=m
CONFIG_OPT4001=m
# CONFIG_OPT4060 is not set
CONFIG_PA12203001=m
CONFIG_SI1133=m
CONFIG_SI1145=m
Expand Down Expand Up @@ -10468,7 +10477,7 @@ CONFIG_NTB_TRANSPORT=m
CONFIG_PWM=y
# CONFIG_PWM_DEBUG is not set
CONFIG_PWM_CLK=m
CONFIG_PWM_CRC=m
CONFIG_PWM_CRC=y
CONFIG_PWM_CROS_EC=m
CONFIG_PWM_DWC_CORE=m
CONFIG_PWM_DWC=m
Expand Down Expand Up @@ -11094,6 +11103,7 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y
# CONFIG_PROC_MEM_FORCE_PTRACE is not set
# CONFIG_PROC_MEM_NO_FORCE is not set
CONFIG_SECURITY=y
CONFIG_HAS_SECURITY_AUDIT=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_INFINIBAND=y
Expand Down Expand Up @@ -11291,7 +11301,6 @@ CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_HCTR2=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XCTR=m
Expand Down Expand Up @@ -11332,7 +11341,6 @@ CONFIG_CRYPTO_SHA3=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM3_GENERIC=m
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_XXHASH=m
Expand Down
14 changes: 0 additions & 14 deletions python/lib/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,6 @@ def prepare_source(base_name, base_ref='origin/master'):

# Patching section
# yapf: disable
if base_name in ('fedora', 'linux-next-llvm'):
# https://lore.kernel.org/20241114163931.GA1928968@thelio-3990X/
commits.append('bd0601e8f99ded716ae1341c39cf8cc30fc28466') # fixup! netfs: Change the read result collector to only use one work item

if base_name in ('fedora', 'rpi'):
# https://lore.kernel.org/20241216180231.GA1069997@ax162/
patches.append('https://lore.kernel.org/all/20241218-crypto-qce-sha-fix-clang-cleanup-error-v1-1-7e6c6dcca345@kernel.org/') # crypto: qce - revert "use __free() for a buffer that's always freed"

if base_name == 'fedora':
patches.append('https://lore.kernel.org/all/[email protected]/') # ALSA: compress_offload: import DMA_BUF namespace
reverts.append('32d053d6f5e92efd82349e7c481cba5a43dc1a22') # arm64/mm: Drop configurable 48-bit physical address space limit

if base_name == 'linux-next-llvm':
# https://lore.kernel.org/20241212014418.GA532802@ax162/
# https://lore.kernel.org/all/20241213-kexec-fix-section-name-for-ffunction-sections-v1-1-1ae6050f6a15@kernel.org/
Expand All @@ -121,8 +109,6 @@ def prepare_source(base_name, base_ref='origin/master'):
patches.append('https://lore.kernel.org/all/[email protected]/') # x86/kexec: Fix stack and handling of re-entry point for ::preserve_context
patches.append('https://lore.kernel.org/all/[email protected]/') # x86/kexec: Fix location of relocate_kernel with -ffunction-sections
patches.append('https://lore.kernel.org/all/[email protected]/') # x86/kexec: Mark machine_kexec() with __nocfi

patches.append('https://lore.kernel.org/all/20241219-amdgpu-fix-enum-float-conversion-again-again-v1-1-ef2c619724b1@kernel.org/') # drm/amd/display: Disable -Wenum-float-conversion for dml2_dpmm_dcn4.c
# yapf: enable

try:
Expand Down

0 comments on commit 204aa14

Please sign in to comment.