Skip to content

Commit

Permalink
env: Update for next-20240513
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
nathanchance committed May 13, 2024
1 parent aaee21d commit 7a63040
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 24 deletions.
32 changes: 24 additions & 8 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.9.0-rc6 Kernel Configuration
# Linux/x86_64 6.9.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 19.0.0git (https://github.com/llvm/llvm-project 2d15855adf6afac3f4171a24fd18b65a32eedf78)"
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 19.0.0git (https://github.com/llvm/llvm-project c8864bceeb20582b4e7a739d8ba3e11052f0e49f)"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
CONFIG_CLANG_VERSION=190000
Expand Down Expand Up @@ -280,7 +280,6 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
Expand Down Expand Up @@ -773,9 +772,15 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y
CONFIG_HAVE_KVM_PM_NOTIFIER=y
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES=y
CONFIG_KVM_PRIVATE_MEM=y
CONFIG_KVM_GENERIC_PRIVATE_MEM=y
CONFIG_HAVE_KVM_GMEM_PREPARE=y
CONFIG_HAVE_KVM_GMEM_INVALIDATE=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_INTEL_PROVE_VE=y
CONFIG_X86_SGX_KVM=y
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
Expand Down Expand Up @@ -969,7 +974,6 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
# end of General architecture-dependent options

CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
CONFIG_MODULE_SIG_FORMAT=y
CONFIG_MODULES=y
CONFIG_MODULE_DEBUGFS=y
Expand Down Expand Up @@ -1013,7 +1017,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
CONFIG_BLK_DEV_WRITE_MOUNTED=y
CONFIG_BLK_DEV_ZONED=y
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_THROTTLING_LOW=y
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
CONFIG_BLK_CGROUP_IOLATENCY=y
Expand Down Expand Up @@ -2077,6 +2080,7 @@ CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
CONFIG_BT_VIRTIO=m
CONFIG_BT_NXPUART=m
# CONFIG_BT_INTEL_PCIE is not set
# end of Bluetooth device drivers

CONFIG_AF_RXRPC=m
Expand Down Expand Up @@ -2190,6 +2194,7 @@ CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
CONFIG_SOCK_VALIDATE_XMIT=y
CONFIG_NET_IEEE8021Q_HELPERS=y
CONFIG_NET_SELFTESTS=m
CONFIG_NET_SOCK_MSG=y
CONFIG_NET_DEVLINK=y
Expand Down Expand Up @@ -3900,6 +3905,7 @@ CONFIG_ATH11K_DEBUGFS=y
CONFIG_ATH11K_SPECTRAL=y
CONFIG_ATH12K=m
CONFIG_ATH12K_DEBUG=y
# CONFIG_ATH12K_DEBUGFS is not set
CONFIG_ATH12K_TRACING=y
CONFIG_WLAN_VENDOR_ATMEL=y
CONFIG_AT76C50X_USB=m
Expand Down Expand Up @@ -4091,6 +4097,7 @@ CONFIG_RTLWIFI_PCI=m
CONFIG_RTLWIFI_USB=m
CONFIG_RTLWIFI_DEBUG=y
CONFIG_RTL8192C_COMMON=m
CONFIG_RTL8192D_COMMON=m
CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
Expand Down Expand Up @@ -4691,6 +4698,7 @@ CONFIG_HPET=y
# CONFIG_HPET_MMAP is not set
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=y
CONFIG_TCG_TPM2_HMAC=y
CONFIG_HW_RANDOM_TPM=y
CONFIG_TCG_TIS_CORE=y
CONFIG_TCG_TIS=y
Expand Down Expand Up @@ -5571,6 +5579,7 @@ CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
CONFIG_DA9062_WATCHDOG=m
# CONFIG_LENOVO_SE10_WDT is not set
CONFIG_MENF21BMC_WATCHDOG=m
CONFIG_MENZ069_WATCHDOG=m
CONFIG_WDAT_WDT=m
Expand Down Expand Up @@ -6250,6 +6259,7 @@ CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_AV=m
CONFIG_VIDEO_IPU3_CIO2=m
# CONFIG_VIDEO_INTEL_IPU6 is not set
CONFIG_INTEL_VSC=m
CONFIG_IPU_BRIDGE=m
CONFIG_RADIO_ADAPTERS=m
Expand Down Expand Up @@ -7555,6 +7565,7 @@ CONFIG_SND_SOC_SOF_METEORLAKE=m
CONFIG_SND_SOC_SOF_INTEL_LNL=m
CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_HDA_COMMON=m
CONFIG_SND_SOC_SOF_HDA_GENERIC=m
CONFIG_SND_SOC_SOF_HDA_MLINK=m
CONFIG_SND_SOC_SOF_HDA_LINK=y
CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
Expand Down Expand Up @@ -8969,6 +8980,7 @@ CONFIG_VFIO_PCI_IGD=y
CONFIG_MLX5_VFIO_PCI=m
CONFIG_PDS_VFIO_PCI=m
CONFIG_VIRTIO_VFIO_PCI=m
# CONFIG_QAT_VFIO_PCI is not set
# end of VFIO support for PCI devices

CONFIG_VFIO_MDEV=m
Expand Down Expand Up @@ -9147,7 +9159,6 @@ CONFIG_MOST_NET=m
CONFIG_MOST_VIDEO=m
CONFIG_MOST_I2C=m
CONFIG_KS7010=m
CONFIG_PI433=m
CONFIG_FIELDBUS_DEV=m
# CONFIG_VME_BUS is not set
# CONFIG_GOLDFISH is not set
Expand Down Expand Up @@ -10714,6 +10725,7 @@ CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP_DEFLATE=y
# CONFIG_EROFS_FS_ZIP_ZSTD is not set
CONFIG_EROFS_FS_ONDEMAND=y
CONFIG_EROFS_FS_PCPU_KTHREAD=y
CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y
Expand Down Expand Up @@ -10863,6 +10875,7 @@ CONFIG_KEYS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_HAVE_TRUSTED_KEYS=y
CONFIG_TRUSTED_KEYS_TPM=y
CONFIG_TRUSTED_KEYS_TEE=y
CONFIG_ENCRYPTED_KEYS=m
Expand Down Expand Up @@ -10983,6 +10996,7 @@ CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_SIG=y
CONFIG_CRYPTO_SIG2=y
CONFIG_CRYPTO_SKCIPHER=y
CONFIG_CRYPTO_SKCIPHER2=y
Expand Down Expand Up @@ -11017,7 +11031,7 @@ CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_DH=y
CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
CONFIG_CRYPTO_ECC=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDH=y
CONFIG_CRYPTO_ECDSA=y
CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
Expand Down Expand Up @@ -11277,6 +11291,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
#
CONFIG_CRYPTO_LIB_UTILS=y
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_AESCFB=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_GF128MUL=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
Expand Down Expand Up @@ -11370,6 +11385,7 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_SWIOTLB=y
# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_CMA=y
# CONFIG_DMA_NUMA_CMA is not set
Expand Down Expand Up @@ -11397,7 +11413,7 @@ CONFIG_CLZ_TAB=y
CONFIG_IRQ_POLL=y
CONFIG_MPILIB=y
CONFIG_SIGNATURE=y
CONFIG_DIMLIB=y
CONFIG_DIMLIB=m
CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_HAVE_GENERIC_VDSO=y
Expand Down
24 changes: 8 additions & 16 deletions python/lib/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,14 @@ def prepare_source(base_name, base_ref='origin/master'):
# Patching section
if base_name in NEXT_TREES:
# https://lore.kernel.org/[email protected]/
patches.append('https://lore.kernel.org/all/[email protected]/') # net: phy: Don't conditionally compile the phy_link_topology creation

if base_name == 'fedora':
patches.append('https://lore.kernel.org/all/[email protected]/') # wifi: nl80211: Avoid address calculations via out of bounds array indexing

# This was in -next through drm-misc-next but for-linux-next in
# drm/misc/kernel is now pointed at drm-misc-next-fixes, which does not
# have this change: https://lore.kernel.org/all/20240503162733.GA4136865@thelio-3990X/
patches.append('https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/c72211751870ffa2cff5d91834059456cfa7cbd5.patch') # drm: xlnx: zynqmp_dpsub: Fix compilation error

if base_name in ('fedora', 'rpi'):
# Revert v1 and apply v2 of "of: reserved_mem: Remove the use of
# phandle from the reserved_mem APIs" to resolve reported clang warning:
# https://lore.kernel.org/[email protected]/
reverts.append('2acef04ad57cab44b33001542791fc93f81cadf1')
patches.append('https://git.kernel.org/robh/p/c56436ef17520c5fb0f9c2fc47aa961a7946895f')
patches.append('https://lore.kernel.org/all/[email protected]/') # net: phy: phy_link_topology: Pass netdevice to phy_link_topo helpers
patches.append('https://lore.kernel.org/all/[email protected]/') # net: phy: phy_link_topology: Lazy-initialize the link topology

patches.append('https://lore.kernel.org/all/20240513-f2fs-add-missing-inline-to-f2fs_build_fault_attr-v1-1-c3ce1c995fa2@kernel.org/') # f2fs: Add inline to f2fs_build_fault_attr() stub

if base_name == 'linux-next-llvm':
# https://lore.kernel.org/20240513151920.GA3061950@thelio-3990X/
reverts.append('32fde9e18b3f557ac2fd12a25fc91211105d3e1e') # KVM: SEV: Provide support for SNP_EXTENDED_GUEST_REQUEST NAE event
# yapf: enable

source_folder = Path(os.environ['CBL_SRC_P'], base_name)
Expand Down

0 comments on commit 7a63040

Please sign in to comment.