diff --git a/Makefile.rhelver b/Makefile.rhelver index 3606a7785..1805083e6 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 = 12 +RHEL_RELEASE = 13 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index bd40f02a8..da4c34693 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -5923,6 +5923,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=m # CONFIG_PHY_DM816X_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set CONFIG_PHY_FSL_LYNX_28G=m CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m CONFIG_PHY_HI3660_USB=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f782c07c1..5da4e92c3 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -5896,6 +5896,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=m # CONFIG_PHY_DM816X_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set CONFIG_PHY_FSL_LYNX_28G=m CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m CONFIG_PHY_HI3660_USB=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 48d035f41..b2f478c45 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1160,7 +1160,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4889,6 +4888,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 73364aa88..8bd6b4b7c 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1160,7 +1160,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4866,6 +4865,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 965bcbbc8..f1e6e2361 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5922,6 +5922,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=m # CONFIG_PHY_DM816X_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set CONFIG_PHY_FSL_LYNX_28G=m CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m CONFIG_PHY_HI3660_USB=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8d57bc66c..42f970e8d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1158,7 +1158,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4885,6 +4884,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d2cbbe60f..e2433500d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5895,6 +5895,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=m # CONFIG_PHY_DM816X_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set CONFIG_PHY_FSL_LYNX_28G=m CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m CONFIG_PHY_HI3660_USB=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d3a5f4326..a06287d2b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1158,7 +1158,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4862,6 +4861,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 5b1bfbb98..c38ff55fe 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1159,7 +1159,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4925,6 +4924,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index bed5d5569..e6167e252 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1159,7 +1159,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4902,6 +4901,7 @@ CONFIG_PHY_BRCM_SATA=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHY_FSL_IMX8M_PCIE=y CONFIG_PHY_FSL_IMX8MQ_USB=m +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index fb3693f4b..f625cbeb0 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4954,6 +4954,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_LAN966X_SERDES is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 348e8a24c..9f00abe20 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -962,7 +962,7 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set +CONFIG_CRYPTO_CURVE25519_PPC64=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4488,6 +4488,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f15d487fd..590cbe25e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4925,6 +4925,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_LAN966X_SERDES is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 097414625..3993e878f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -962,7 +962,7 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set +CONFIG_CRYPTO_CURVE25519_PPC64=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set @@ -4467,6 +4467,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4b541862f..d42e31d54 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4919,6 +4919,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_LAN966X_SERDES is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 063ee750e..0ae0e25a1 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -962,7 +962,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m @@ -4467,6 +4466,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7a300b09d..5dde7bbc5 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4890,6 +4890,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_LAN966X_SERDES is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 1751607db..c2f517c05 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -962,7 +962,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m @@ -4446,6 +4445,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 96d09fe95..8e974e206 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -963,7 +963,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y # CONFIG_CRYPTO_CURVE25519 is not set -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES_S390=y CONFIG_CRYPTO_DES=y @@ -4457,6 +4456,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a5f6fbf0d..0d3e8570a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5376,6 +5376,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_INTEL_LGM_COMBO is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index e2667777a..d1ff63198 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1007,7 +1007,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m @@ -4721,6 +4720,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index beb398335..9ec480fb9 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5349,6 +5349,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_CADENCE_TORRENT=m # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_HI3670_PCIE is not set # CONFIG_PHY_HI3670_USB is not set # CONFIG_PHY_INTEL_LGM_COMBO is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 990453318..760d86592 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1007,7 +1007,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m @@ -4700,6 +4699,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 10b57cc18..54e4ab401 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1008,7 +1008,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m @@ -4761,6 +4760,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index de03489f1..c0530dc1c 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1008,7 +1008,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m -# CONFIG_CRYPTO_CURVE25519_PPC64 is not set CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m @@ -4740,6 +4739,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_FSL_IMX8QM_HSIO is not set # CONFIG_PHY_FSL_LYNX_28G is not set # CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY is not set # CONFIG_PHY_HI3660_USB is not set diff --git a/kernel.changelog b/kernel.changelog index 68ae78361..5ba642ed2 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,11 @@ -* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.12] +* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.13] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.12] +- Linux v6.11.0-0.rc0.c33ffdb70cc6 +Resolves: + * Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.11] - Linux v6.11.0-0.rc0.786c8248dbd3 Resolves: diff --git a/kernel.spec b/kernel.spec index 651230dbf..6744a87e3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc0.20240724git786c8248dbd3.12 +%define pkgrelease 0.rc0.20240725gitc33ffdb70cc6.13 %define kversion 6 -%define tarfile_release 6.10-12246-g786c8248dbd3 +%define tarfile_release 6.10-12381-gc33ffdb70cc6 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240724git786c8248dbd3.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20240725gitc33ffdb70cc6.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -715,7 +715,7 @@ BuildRequires: openssl-devel %endif %if %{with_bpftool} BuildRequires: python3-docutils -BuildRequires: zlib-devel binutils-devel +BuildRequires: zlib-devel binutils-devel llvm-devel %endif %if %{with_selftests} BuildRequires: clang llvm-devel fuse-devel @@ -2775,7 +2775,7 @@ BuildKernel() { # Build the bootstrap bpftool to generate vmlinux.h export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") - CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap + CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap tools/bpf/bpftool/bootstrap/bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h fi @@ -2987,7 +2987,7 @@ echo "${RPM_VMLINUX_H}" > ../vmlinux_h_path %if %{with_bpftool} %global bpftool_make \ - %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1 + %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1 %{log_msg "build bpftool"} pushd tools/bpf/bpftool %{bpftool_make} @@ -4043,9 +4043,12 @@ fi\ # # %changelog -* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.12] +* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.13] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.12] +- Linux v6.11.0-0.rc0.c33ffdb70cc6 + * Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.11] - Linux v6.11.0-0.rc0.786c8248dbd3 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 93a06abc3..5c4836791 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -899,7 +899,7 @@ index e12b531f5c2f..082707f8dff8 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 2597cb43f438..d860f4f6ba2c 100644 +index b02a12436750..137c395b94da 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -51,6 +51,7 @@ @@ -910,7 +910,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 #include #include #include -@@ -309,6 +310,11 @@ static void crng_fast_key_erasure(u8 key[CHACHA_KEY_SIZE], +@@ -322,6 +323,11 @@ static void crng_fast_key_erasure(u8 key[CHACHA_KEY_SIZE], memzero_explicit(first_block, sizeof(first_block)); } @@ -922,7 +922,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 /* * This function returns a ChaCha state that you may use for generating * random data. It also returns up to 32 bytes on its own of random data -@@ -739,6 +745,9 @@ static void __cold _credit_init_bits(size_t bits) +@@ -755,6 +761,9 @@ static void __cold _credit_init_bits(size_t bits) } @@ -932,7 +932,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 /********************************************************************** * * Entropy collection routines. -@@ -956,6 +965,19 @@ void __init add_bootloader_randomness(const void *buf, size_t len) +@@ -972,6 +981,19 @@ void __init add_bootloader_randomness(const void *buf, size_t len) credit_init_bits(len * 8); } @@ -952,7 +952,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 #if IS_ENABLED(CONFIG_VMGENID) static BLOCKING_NOTIFIER_HEAD(vmfork_chain); -@@ -1365,6 +1387,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags +@@ -1381,6 +1403,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags { struct iov_iter iter; int ret; @@ -960,7 +960,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) return -EINVAL; -@@ -1376,6 +1399,21 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags +@@ -1392,6 +1415,21 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags if ((flags & (GRND_INSECURE | GRND_RANDOM)) == (GRND_INSECURE | GRND_RANDOM)) return -EINVAL; @@ -982,7 +982,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 if (!crng_ready() && !(flags & GRND_INSECURE)) { if (flags & GRND_NONBLOCK) return -EAGAIN; -@@ -1396,6 +1434,12 @@ static __poll_t random_poll(struct file *file, poll_table *wait) +@@ -1412,6 +1450,12 @@ static __poll_t random_poll(struct file *file, poll_table *wait) return crng_ready() ? EPOLLIN | EPOLLRDNORM : EPOLLOUT | EPOLLWRNORM; } @@ -995,7 +995,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 static ssize_t write_pool_user(struct iov_iter *iter) { u8 block[BLAKE2S_BLOCK_SIZE]; -@@ -1536,7 +1580,58 @@ static int random_fasync(int fd, struct file *filp, int on) +@@ -1552,7 +1596,58 @@ static int random_fasync(int fd, struct file *filp, int on) return fasync_helper(fd, filp, on, &fasync); } @@ -1054,7 +1054,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 .read_iter = random_read_iter, .write_iter = random_write_iter, .poll = random_poll, -@@ -1549,6 +1644,7 @@ const struct file_operations random_fops = { +@@ -1565,6 +1660,7 @@ const struct file_operations random_fops = { }; const struct file_operations urandom_fops = { @@ -1062,7 +1062,7 @@ index 2597cb43f438..d860f4f6ba2c 100644 .read_iter = urandom_read_iter, .write_iter = random_write_iter, .unlocked_ioctl = random_ioctl, -@@ -1559,6 +1655,32 @@ const struct file_operations urandom_fops = { +@@ -1575,6 +1671,32 @@ const struct file_operations urandom_fops = { .splice_write = iter_file_splice_write, }; diff --git a/sources b/sources index b295a9bc8..caf173f76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-12246-g786c8248dbd3.tar.xz) = dd1f1c7926bff02bfcb3c2d03715ab2215abe07a57b4399486c7fce7ee9a10785146bcd6f066615e6c9556f2f18525a863aa37c11780b763b8e07e2f4a832ef1 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e8cc4920c4b020c72db1f975b296b69ba0243dc1a9f8624817e5ccbaa872b9afde1a17544b68decca6959d6465b010a48316ded8091d6bc9a1b8c33144e5e8c3 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 142d4b774c35fabdb1aa7601045184dde92a6392ce0df33208f55a717de05f945a692bb8bb42c3553bf3be749efb439a726e08513a2273eab87122d174d94433 +SHA512 (linux-6.10-12381-gc33ffdb70cc6.tar.xz) = 926dbedffae4529f5d62b0493e7378e04fd08143ef782ebd45b107ac7983a48e22577083d788aba57b70663ec624e8b2c281e5b11c68054b577dff5dfb85182c +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 51ddc035c1e079293464f691d5994444489044c3e666e29df29f497ac352f6fc9c38869e83ee1a5b54e2d60c804a4b588e81f97b05511348f511976cbc01b2f3 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b3ce6df42b18c9363c0e0197678f80cfcbc59603a09363337d2920e5f69aa1fce030854c1e57dca725869f66eca93285168ae4f15b7dc01a15bfbc0008bdbf90