diff options
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-aarch64-debug-rhel.config | 11 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 4 | ||||
-rw-r--r-- | kernel-aarch64-rhel.config | 11 | ||||
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-fedora.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 3 | ||||
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-ppc64le-debug-rhel.config | 8 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 3 | ||||
-rw-r--r-- | kernel-ppc64le-rhel.config | 8 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-s390x-debug-rhel.config | 8 | ||||
-rw-r--r-- | kernel-s390x-fedora.config | 3 | ||||
-rw-r--r-- | kernel-s390x-rhel.config | 8 | ||||
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 8 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-x86_64-debug-rhel.config | 9 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 3 | ||||
-rw-r--r-- | kernel-x86_64-rhel.config | 9 | ||||
-rwxr-xr-x | kernel.spec | 19 | ||||
-rw-r--r-- | sources | 6 |
24 files changed, 63 insertions, 82 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index dd01e141a..5741dcd4c 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 = 33 +RHEL_RELEASE = 34 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 64d1a45d4..019eca70d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2659,7 +2659,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y CONFIG_HW_RANDOM_BCM2835=m CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y +CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5649,7 +5649,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4c0a14993..be3b268b8 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -188,7 +188,7 @@ CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMBA_PL08X is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m @@ -925,7 +925,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y -# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ=y @@ -2081,7 +2081,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y +CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2389,7 +2389,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2411,7 +2410,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4446,7 +4445,7 @@ CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1f30e989b..302d8258b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2643,7 +2643,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y CONFIG_HW_RANDOM_BCM2835=m CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y +CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5628,7 +5628,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a40706b24..5a51a342b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -188,7 +188,7 @@ CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMBA_PL08X is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m @@ -925,7 +925,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y -# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ=y @@ -2065,7 +2065,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y +CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2373,7 +2373,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2395,7 +2394,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4423,7 +4422,7 @@ CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 70bae63d2..60e354811 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2674,7 +2674,6 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_BCM2835=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5735,7 +5734,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0524465b2..1508c9f06 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2659,7 +2659,6 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_BCM2835=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5716,7 +5715,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 049f01285..49f689403 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2622,7 +2622,6 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_BCM2835=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5583,7 +5582,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index cc3bbcaa6..f73a79fa6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2607,7 +2607,6 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_BCM2835=m # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_IPROC_RNG200=m @@ -5564,7 +5563,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f4582069d..518282ea6 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2179,7 +2179,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -4768,7 +4767,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 9f925539e..e2c9df7e2 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -181,7 +181,7 @@ CONFIG_ALTIVEC=y CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m @@ -1915,7 +1915,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m @@ -2215,7 +2214,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2237,7 +2235,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4238,7 +4236,7 @@ CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9ff574cb1..d07d04e5a 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2162,7 +2162,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -4747,7 +4746,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 71767961c..d9a0cdf99 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -181,7 +181,7 @@ CONFIG_ALTIVEC=y CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m @@ -1899,7 +1899,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m @@ -2199,7 +2198,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2221,7 +2219,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4217,7 +4215,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 38254af55..3fa9633c3 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2164,7 +2164,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -4707,7 +4706,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3e759bde9..45ab2e139 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -178,7 +178,7 @@ CONFIG_AIO=y CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m @@ -1907,7 +1907,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set @@ -2200,7 +2199,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2222,7 +2220,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4181,7 +4179,7 @@ CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c612cfcbb..588e4bbdf 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2147,7 +2147,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -4686,7 +4685,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6a8e88fca..44d4d50e4 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -178,7 +178,7 @@ CONFIG_AIO=y CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m @@ -1891,7 +1891,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set @@ -2184,7 +2183,6 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2206,7 +2204,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4160,7 +4158,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index cbba045fe..42631f268 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -178,7 +178,7 @@ CONFIG_AIO=y CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m @@ -1901,7 +1901,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set @@ -2195,7 +2194,6 @@ CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m @@ -2217,7 +2215,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4175,7 +4173,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5cb0f3b46..5b90841f8 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2357,7 +2357,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5098,7 +5097,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index e40f3d4a1..7a7f8ce87 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -195,7 +195,7 @@ CONFIG_ALTERA_STAPL=m CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_IOMMU_V2=m CONFIG_AMD_IOMMU=y @@ -2035,7 +2035,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2344,7 +2343,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set +CONFIG_INTEL_HFI_THERMAL=y CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m @@ -2386,7 +2385,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4406,7 +4405,7 @@ CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 7067cc79f..31c854362 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2340,7 +2340,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5078,7 +5077,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ccfceff98..826960d3f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -195,7 +195,7 @@ CONFIG_ALTERA_STAPL=m CONFIG_ALX=m # CONFIG_AM2315 is not set # CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_HSMP is not set +CONFIG_AMD_HSMP=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_IOMMU_V2=m CONFIG_AMD_IOMMU=y @@ -2019,7 +2019,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set -CONFIG_HW_RANDOM_CN10K=y CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2328,7 +2327,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set -# CONFIG_INTEL_HFI_THERMAL is not set +CONFIG_INTEL_HFI_THERMAL=y CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m @@ -2370,7 +2369,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SAR_INT1092 is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set -# CONFIG_INTEL_SDSI is not set +CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SMARTCONNECT is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set @@ -4384,7 +4383,7 @@ CONFIG_RAID_ATTRS=m CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set diff --git a/kernel.spec b/kernel.spec index 261b0f5c4..46102c17a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc4.33 +%global distro_build 0.rc4.20220426gitd615b5416f8a1af.34 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -131,13 +131,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc4.33 +%define pkgrelease 0.rc4.20220426gitd615b5416f8a1af.34 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.33%{?buildid}%{?dist} +%define specrelease 0.rc4.20220426gitd615b5416f8a1af.34%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc4.tar.xz +Source0: linux-5.18-rc4-6-gd615b5416f8a1af.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc4 -c -mv linux-5.18-rc4 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc4-6-gd615b5416f8a1af -c +mv linux-5.18-rc4-6-gd615b5416f8a1af linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3027,6 +3027,11 @@ fi # # %changelog +* Tue Apr 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc4.d615b5416f8a1af.33] +- Turn on CONFIG_RANDOM_TRUST_BOOTLOADER (Justin M. Forbes) +- redhat/configs: aarch64: enable CPU_FREQ_GOV_SCHEDUTIL (Mark Salter) +- Move CONFIG_HW_RANDOM_CN10K to a proper place (Vladis Dronov) + * Sat Apr 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.c00c5e1d157bec0.30] - redhat/self-test: Clean up data set (Prarit Bhargava) - redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc4.tar.xz) = dfbaf08953a99ca7e0c3869b6c6e57534c606a225fbee7c121075a3cdba88f3bfaa7704bfd11a5e4f40851c08e5226f58e9862ad9425c22076a80a00c2f2ce19 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.33.tar.bz2) = b1cbc4e9d805db05d500ee6140799c79265c52d32b939bf6ba08a1263cf38999a06c23e9f00593d2feb6173c17145a312fd984abbded706e1bac1d7b48a1bcb9 -SHA512 (kernel-kabi-dw-5.18.0-0.rc4.33.tar.bz2) = 2bfe9483c747cc7f26ec689d7551cd5d9eea89a673f5978ca27a721bb71d3d9674e2d5d946d09b5d5f50c7cb60ff3f27639adb08a2a85aa3d926a0aefbabdf91 +SHA512 (linux-5.18-rc4-6-gd615b5416f8a1af.tar.xz) = dea56ec7d3bb91fb52b9ca1ded84632a1582fe5963c8e392b4624c2042e9dbb0ad64b53838d851be1a9b7a6164085db831772b08354d37b747c3b094b7af9f2b +SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220426gitd615b5416f8a1af.34.tar.bz2) = c8a0f2d45b78686b15519e0ee1dd4c82b747a9b0f723a3c5a2ebcd46dbbd5917c6afb0192934a2082f327fedfc31af8b408880f5b759997083272a70763302b2 +SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220426gitd615b5416f8a1af.34.tar.bz2) = 63ebf8fbfaf4b7cc3f21b9f7454796e658d0038c5edf4d9b677460bf2f923316d30b6f80b0c1422bc5745edcba71a383dc17fc6b88c846ad34899d2c3d0be187 |