diff options
28 files changed, 174 insertions, 173 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 6a1f6507f..e6c1574d2 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 125 +RHEL_RELEASE = 129 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 08e708fb4..ae97c327f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ac66897491812e72306020ec0bbf718f5d0b56f7 - ac66897491812e72306020ec0bbf718f5d0b56f7 irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/4e5047bf34d5d92141b81938a4fea7364e65ab01 + 4e5047bf34d5d92141b81938a4fea7364e65ab01 irq: export irq_check_status_bit https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8 e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins... diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4a70df11e..39024fd37 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6496,7 +6496,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6509,8 +6511,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_APQ8016_SBC=m CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6655,7 +6655,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -6989,9 +6989,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATION=y @@ -8172,7 +8172,7 @@ CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 42df73ce4..6a9785986 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -167,7 +167,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1151,7 +1151,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5191,8 +5191,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d759ac7e8..1a43cef3e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6472,7 +6472,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6485,8 +6487,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_APQ8016_SBC=m CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6631,7 +6631,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -6964,9 +6964,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATION=y @@ -8146,7 +8146,7 @@ CONFIG_WLCORE_SPI=m # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 08e573649..8f95812ba 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -167,7 +167,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1143,7 +1143,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5169,8 +5169,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 8893a83b9..47438a158 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6665,9 +6665,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -CONFIG_SND_SOC_ADI_AXI_I2S=m -CONFIG_SND_SOC_ADI_AXI_SPDIF=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6680,8 +6680,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6841,7 +6839,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -7226,9 +7224,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATE=y @@ -8479,7 +8477,7 @@ CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8ee6ceb14..9fc88ccac 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6644,9 +6644,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -CONFIG_SND_SOC_ADI_AXI_I2S=m -CONFIG_SND_SOC_ADI_AXI_SPDIF=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6659,8 +6659,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6820,7 +6818,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -7204,9 +7202,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATE=y @@ -8456,7 +8454,7 @@ CONFIG_WLCORE_SPI=m # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a982c8263..0a294c27a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6467,7 +6467,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6480,8 +6482,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6631,7 +6631,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -6983,9 +6983,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATE=y @@ -8209,7 +8209,7 @@ CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 10ea20e6e..a40114a14 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6446,7 +6446,9 @@ CONFIG_SND_SOC_ADAU1977_I2C=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6459,8 +6461,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m @@ -6610,7 +6610,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -6961,9 +6961,9 @@ CONFIG_SUNXI_SRAM=y CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWP_EMULATE=y @@ -8186,7 +8186,7 @@ CONFIG_WLCORE_SPI=m # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index c73c03441..4b7d7b1fd 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5856,7 +5856,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6023,7 +6025,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y @@ -6291,9 +6293,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE3_WMI=m -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y # CONFIG_SW_SYNC is not set @@ -7422,7 +7424,7 @@ CONFIG_X86_PTDUMP=y # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW=64 -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=y CONFIG_X86_SPEEDSTEP_LIB=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index f4d508486..551e8a378 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5835,7 +5835,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6002,7 +6004,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y @@ -6269,9 +6271,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE3_WMI=m -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y # CONFIG_SW_SYNC is not set @@ -7399,7 +7401,7 @@ CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW=64 -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=y CONFIG_X86_SPEEDSTEP_LIB=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f1e61ab27..397df0ac6 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5522,7 +5522,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -5535,8 +5537,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5648,7 +5648,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -5884,9 +5884,9 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y @@ -6939,7 +6939,7 @@ CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index bdb259d17..0ccc6f608 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -162,7 +162,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1033,7 +1033,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5036,8 +5036,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f037f05a0..7c398de46 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5500,7 +5500,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -5513,8 +5515,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5626,7 +5626,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -5861,9 +5861,9 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y @@ -6915,7 +6915,7 @@ CONFIG_WLCORE_SPI=m # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6e66af0ec..85bfe56ba 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -162,7 +162,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1025,7 +1025,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5018,8 +5018,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f70ea25df..c2cb6e415 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5464,7 +5464,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -5477,8 +5479,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5590,7 +5590,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -5822,9 +5822,9 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m # CONFIG_SUSPEND is not set CONFIG_SWAP=y # CONFIG_SW_SYNC is not set @@ -6881,7 +6881,7 @@ CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 8feb1e7e0..f60ae530e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y @@ -1039,7 +1039,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4979,8 +4979,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8a3e04aeb..b68b8500b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5442,7 +5442,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -5455,8 +5457,6 @@ CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5568,7 +5568,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set @@ -5799,9 +5799,9 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m # CONFIG_SUSPEND is not set CONFIG_SWAP=y # CONFIG_SW_SYNC is not set @@ -6857,7 +6857,7 @@ CONFIG_WLCORE_SPI=m # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 660fa68c6..393dc3e1f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y @@ -1031,7 +1031,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4961,8 +4961,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index dc58b0c5e..1dd18fd38 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1041,7 +1041,7 @@ CONFIG_DEFAULT_SECURITY_DAC=y # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4990,8 +4990,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5a40ad6e5..0e0dfff19 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5908,7 +5908,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6076,7 +6078,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y @@ -6347,9 +6349,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE3_WMI=m -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWIOTLB=y @@ -7472,7 +7474,7 @@ CONFIG_X86_POWERNOW_K8=m CONFIG_X86_PTDUMP=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW=64 -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SYSFB is not set CONFIG_X86_UV=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index c28290d3c..1bb1ad85c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -181,7 +181,7 @@ CONFIG_AMD_IOMMU=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1096,7 +1096,7 @@ CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m CONFIG_DELL_WMI=m -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5187,7 +5187,7 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set +CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 0215be6ad..efd96d6bf 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5885,7 +5885,9 @@ CONFIG_SND_SOC_ADAU1761_SPI=m CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7118_HW=m CONFIG_SND_SOC_ADAU7118_I2C=m -# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_ADI_AXI_I2S is not set +# CONFIG_SND_SOC_ADI_AXI_SPDIF is not set +CONFIG_SND_SOC_ADI=m # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4458 is not set @@ -6053,7 +6055,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SM8250 is not set CONFIG_SND_SOC_SOF_ACPI=m -# CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y @@ -6323,9 +6325,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE3_WMI=m -# CONFIG_SURFACE_GPE is not set +CONFIG_SURFACE_GPE=m CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_SUSPEND=y CONFIG_SWAP=y CONFIG_SWIOTLB=y @@ -7447,7 +7449,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW=64 -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SYSFB is not set CONFIG_X86_UV=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 164b5f720..c2681d4cf 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -181,7 +181,7 @@ CONFIG_AMD_IOMMU=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1088,7 +1088,7 @@ CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m CONFIG_DELL_WMI=m -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5166,7 +5166,7 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set +CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel.spec b/kernel.spec index cb6b00b81..3103c2543 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.20210114git65f0d2414b70.125 +%global distro_build 0.rc4.129 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc3.20210114git65f0d2414b70.125 +%define pkgrelease 0.rc4.129 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20210114git65f0d2414b70.125%{?buildid}%{?dist} +%define specrelease 0.rc4.129%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -201,7 +201,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.11 @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210114git65f0d2414b70.tar.xz +Source0: linux-5.11-rc4.tar.xz Source1: Makefile.rhelver @@ -614,47 +614,48 @@ Source1: Makefile.rhelver %define signing_key_filename kernel-signing-s390.cer %endif -Source10: x509.genkey.rhel -Source11: x509.genkey.fedora +Source8: x509.genkey.rhel +Source9: x509.genkey.fedora + %if %{?released_kernel} -Source12: redhatsecurebootca5.cer -Source13: redhatsecurebootca1.cer -Source14: redhatsecureboot501.cer -Source15: redhatsecureboot301.cer -Source16: secureboot_s390.cer -Source17: secureboot_ppc.cer +Source10: redhatsecurebootca5.cer +Source11: redhatsecurebootca1.cer +Source12: redhatsecureboot501.cer +Source13: redhatsecureboot301.cer +Source14: secureboot_s390.cer +Source15: secureboot_ppc.cer -%define secureboot_ca_1 %{SOURCE12} -%define secureboot_ca_0 %{SOURCE13} +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} %ifarch x86_64 aarch64 -%define secureboot_key_1 %{SOURCE14} +%define secureboot_key_1 %{SOURCE12} %define pesign_name_1 redhatsecureboot501 -%define secureboot_key_0 %{SOURCE15} +%define secureboot_key_0 %{SOURCE13} %define pesign_name_0 redhatsecureboot301 %endif %ifarch s390x -%define secureboot_key_0 %{SOURCE16} +%define secureboot_key_0 %{SOURCE14} %define pesign_name_0 redhatsecureboot302 %endif %ifarch ppc64le -%define secureboot_key_0 %{SOURCE17} +%define secureboot_key_0 %{SOURCE15} %define pesign_name_0 redhatsecureboot303 %endif # released_kernel %else -Source12: redhatsecurebootca4.cer -Source13: redhatsecurebootca2.cer -Source14: redhatsecureboot401.cer -Source15: redhatsecureboot003.cer +Source10: redhatsecurebootca4.cer +Source11: redhatsecurebootca2.cer +Source12: redhatsecureboot401.cer +Source13: redhatsecureboot003.cer -%define secureboot_ca_1 %{SOURCE12} -%define secureboot_ca_0 %{SOURCE13} -%define secureboot_key_1 %{SOURCE14} +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} +%define secureboot_key_1 %{SOURCE12} %define pesign_name_1 redhatsecureboot401 -%define secureboot_key_0 %{SOURCE15} +%define secureboot_key_0 %{SOURCE13} %define pesign_name_0 redhatsecureboot003 # released_kernel @@ -1245,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210114git65f0d2414b70 -c -mv linux-20210114git65f0d2414b70 linux-%{KVERREL} +%setup -q -n kernel-5.11-rc4 -c +mv linux-5.11-rc4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2065,11 +2066,11 @@ popd %endif %if %{with_selftests} -%{make} -s ARCH=$Arch V=1 samples/bpf/ +%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 samples/bpf/ pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which # doesn't seem possible to do in the install section. -%{make} -s ARCH=$Arch V=1 TARGETS="bpf livepatch net" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install +%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install popd %endif @@ -2734,10 +2735,20 @@ fi # # %changelog -* Thu Jan 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc3.20210114git65f0d2414b70.125] +* Mon Jan 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc4.129] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Sat Jan 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc3.20210116git1d94330a437a.126] +- Fedora 5.11 configs pt 1 ("Justin M. Forbes") + +* Fri Jan 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc3.20210115git5ee88057889b.125] +- redhat: avoid conflict with mod-blacklist.sh and released_kernel defined ("Herton R. Krzesinski") +- redhat: handle certificate files conditionally as done for src.rpm ("Herton R. Krzesinski") +- Run MR testing in CKI pipeline (Veronika Kabatova) +- specfile: add {?_smp_mflags} to "make headers_install" in tools/testing/selftests (Denys Vlasenko) +- specfile: add {?_smp_mflags} to "make samples/bpf/" (Denys Vlasenko) + * Thu Jan 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc3.20210114git65f0d2414b70.124] - Reword comment (Nicolas Chauvet) - Add with_cross_arm conditional (Nicolas Chauvet) diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 220038e21..dc3638bee 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -94,7 +94,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 9e3cdb271d06..e98bca34b9d5 100644 +index a10b545c2070..119710ce904a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5526,6 +5526,14 @@ @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 9e73f82e0d86..3b03f12f6f3e 100644 +index b0e4767735dc..be03cc790748 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -287,10 +287,10 @@ index a13d90206472..6a6aae01755b 100644 #define get_user(x, p) \ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 05e17351e4f3..306ae6ff5346 100644 +index f39568b28ec1..794d5413765b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -896,7 +896,7 @@ endchoice +@@ -894,7 +894,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -299,7 +299,7 @@ index 05e17351e4f3..306ae6ff5346 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1149,6 +1149,7 @@ config XEN +@@ -1147,6 +1147,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) @@ -562,10 +562,10 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 80b668c80073..fa30cf6100dd 100644 +index 58ff36340cd7..3e2854a6d953 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1605,6 +1605,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1618,6 +1618,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; @@ -1,3 +1,3 @@ -SHA512 (linux-20210114git65f0d2414b70.tar.xz) = e1ccfd1b50f54880fc6feba3e69dae20eb1db1556e7eceddc755d20aef2ee44e31bb825a416df36185e0e40bdbf86f7c5bd58ebcebae69b8a9f09a30198bc088 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc3.20210114git65f0d2414b70.125.tar.bz2) = 364faf6da4794311a44c9a3a2d9b4cf21aee075f1163f6beb97968dec86c5f2404d5619ff639d0d9838c4b450bd689df36fba165e3bb4652125fd500d162a30c -SHA512 (kernel-kabi-dw-5.11.0-0.rc3.20210114git65f0d2414b70.125.tar.bz2) = 0ae859a44e8d7298aeb51c1b8772411f212a8aeb50be0fecb8b5fb2fb456d6e7e2725513939f9b482fafb8de54e299a255da97e5387fab4ecff6cba820f3c35e +SHA512 (linux-5.11-rc4.tar.xz) = 5168c685754a2942d5b67a118e42c352ec8f2ce9a258d76bc3ceed5bab2460f2185c8c11017d76ac5931a62bd8a2cdc646fe4e0620934cb8ae77caa174c49337 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.129.tar.bz2) = 176d2643f0ee0816dac34a6b987cd0a123ca3aea29ff232c692f976cb87434fd1d313bfd560497f20b654e39f2f322db7aab19415a5024dd70f7407fcffc75fc +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.129.tar.bz2) = a27aa9f58fd9553ed4ff00fd2ea92651f9157c5cf72f9606f2f5f090bd8f3a6635885285d5b28c7dce8ed89d088177332e3b8d3b3bcdae9e5b1c73126aca75a9 |