diff --git a/Makefile.rhelver b/Makefile.rhelver index be7005581..5b2560499 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 = 64 +RHEL_RELEASE = 68 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 55854f16d..c11f5cdd5 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -2131,7 +2131,7 @@ CONFIG_DRM_TEGRA_STAGING=y # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TI_DLPC3433=m CONFIG_DRM_TIDSS=m -# CONFIG_DRM_TI_SN65DSI83 is not set +CONFIG_DRM_TI_SN65DSI83=m CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m CONFIG_DRM_TI_TPD12S015=m @@ -7424,7 +7424,7 @@ CONFIG_SMS_USB_DRV=m # CONFIG_SM_TCSRCC_8550 is not set # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set -# CONFIG_SM_VIDEOCC_8350 is not set +CONFIG_SM_VIDEOCC_8350=m # CONFIG_SM_VIDEOCC_8450 is not set # CONFIG_SM_VIDEOCC_8550 is not set CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 @@ -8195,7 +8195,7 @@ CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=m CONFIG_SPI_ROCKCHIP=m -# CONFIG_SPI_ROCKCHIP_SFC is not set +CONFIG_SPI_ROCKCHIP_SFC=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SLAVE is not set @@ -8579,7 +8579,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set +CONFIG_TI_ICSSG_PRUETH=m CONFIG_TI_ICSS_IEP=m CONFIG_TI_K3_AM65_CPSW_NUSS=m CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y @@ -9434,7 +9434,7 @@ CONFIG_VIDEO_IMX8_ISI=m CONFIG_VIDEO_IMX8_ISI_M2M=y CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m -CONFIG_VIDEO_IMX_MEDIA=m +# CONFIG_VIDEO_IMX_MEDIA is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IPU3_CIO2 is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 53d962bf4..d8cc555fa 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -2122,7 +2122,7 @@ CONFIG_DRM_TEGRA_STAGING=y # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TI_DLPC3433=m CONFIG_DRM_TIDSS=m -# CONFIG_DRM_TI_SN65DSI83 is not set +CONFIG_DRM_TI_SN65DSI83=m CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m CONFIG_DRM_TI_TPD12S015=m @@ -7397,7 +7397,7 @@ CONFIG_SMS_USB_DRV=m # CONFIG_SM_TCSRCC_8550 is not set # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set -# CONFIG_SM_VIDEOCC_8350 is not set +CONFIG_SM_VIDEOCC_8350=m # CONFIG_SM_VIDEOCC_8450 is not set # CONFIG_SM_VIDEOCC_8550 is not set CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 @@ -8166,7 +8166,7 @@ CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=m CONFIG_SPI_ROCKCHIP=m -# CONFIG_SPI_ROCKCHIP_SFC is not set +CONFIG_SPI_ROCKCHIP_SFC=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SLAVE is not set @@ -8550,7 +8550,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set +CONFIG_TI_ICSSG_PRUETH=m CONFIG_TI_ICSS_IEP=m CONFIG_TI_K3_AM65_CPSW_NUSS=m CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y @@ -9405,7 +9405,7 @@ CONFIG_VIDEO_IMX8_ISI=m CONFIG_VIDEO_IMX8_ISI_M2M=y CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m -CONFIG_VIDEO_IMX_MEDIA=m +# CONFIG_VIDEO_IMX_MEDIA is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IPU3_CIO2 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 140ee3b5e..9c549d295 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2131,7 +2131,7 @@ CONFIG_DRM_TEGRA_STAGING=y # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TI_DLPC3433=m CONFIG_DRM_TIDSS=m -# CONFIG_DRM_TI_SN65DSI83 is not set +CONFIG_DRM_TI_SN65DSI83=m CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m CONFIG_DRM_TI_TPD12S015=m @@ -7424,7 +7424,7 @@ CONFIG_SMS_USB_DRV=m # CONFIG_SM_TCSRCC_8550 is not set # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set -# CONFIG_SM_VIDEOCC_8350 is not set +CONFIG_SM_VIDEOCC_8350=m # CONFIG_SM_VIDEOCC_8450 is not set # CONFIG_SM_VIDEOCC_8550 is not set CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 @@ -8195,7 +8195,7 @@ CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=m CONFIG_SPI_ROCKCHIP=m -# CONFIG_SPI_ROCKCHIP_SFC is not set +CONFIG_SPI_ROCKCHIP_SFC=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SLAVE is not set @@ -8579,7 +8579,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set +CONFIG_TI_ICSSG_PRUETH=m CONFIG_TI_ICSS_IEP=m CONFIG_TI_K3_AM65_CPSW_NUSS=m CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y @@ -9434,7 +9434,7 @@ CONFIG_VIDEO_IMX8_ISI=m CONFIG_VIDEO_IMX8_ISI_M2M=y CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m -CONFIG_VIDEO_IMX_MEDIA=m +# CONFIG_VIDEO_IMX_MEDIA is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IPU3_CIO2 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 5879b1c19..8c9346e7e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2122,7 +2122,7 @@ CONFIG_DRM_TEGRA_STAGING=y # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TI_DLPC3433=m CONFIG_DRM_TIDSS=m -# CONFIG_DRM_TI_SN65DSI83 is not set +CONFIG_DRM_TI_SN65DSI83=m CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m CONFIG_DRM_TI_TPD12S015=m @@ -7397,7 +7397,7 @@ CONFIG_SMS_USB_DRV=m # CONFIG_SM_TCSRCC_8550 is not set # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set -# CONFIG_SM_VIDEOCC_8350 is not set +CONFIG_SM_VIDEOCC_8350=m # CONFIG_SM_VIDEOCC_8450 is not set # CONFIG_SM_VIDEOCC_8550 is not set CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 @@ -8166,7 +8166,7 @@ CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=m CONFIG_SPI_ROCKCHIP=m -# CONFIG_SPI_ROCKCHIP_SFC is not set +CONFIG_SPI_ROCKCHIP_SFC=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SLAVE is not set @@ -8550,7 +8550,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set +CONFIG_TI_ICSSG_PRUETH=m CONFIG_TI_ICSS_IEP=m CONFIG_TI_K3_AM65_CPSW_NUSS=m CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y @@ -9405,7 +9405,7 @@ CONFIG_VIDEO_IMX8_ISI=m CONFIG_VIDEO_IMX8_ISI_M2M=y CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m -CONFIG_VIDEO_IMX_MEDIA=m +# CONFIG_VIDEO_IMX_MEDIA is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IPU3_CIO2 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 8409b3906..23cec9796 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -7147,8 +7147,6 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 8abec2ec6..8632ef4fc 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -7116,8 +7116,6 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c110c16c8..7b5c37284 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -7071,8 +7071,6 @@ CONFIG_TIFM_7XX1=m # CONFIG_TIFM_CORE is not set CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 088c923d4..3038fda4b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -7040,8 +7040,6 @@ CONFIG_TIFM_7XX1=m # CONFIG_TIFM_CORE is not set CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3454368ef..736dd4caa 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7605,8 +7605,6 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cd5fb334b..368e134ae 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7575,8 +7575,6 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m -# CONFIG_TI_ICSSG_PRUETH is not set -CONFIG_TI_ICSS_IEP=m CONFIG_TI_LMP92064=m CONFIG_TIME_KUNIT_TEST=m CONFIG_TIME_NS=y diff --git a/kernel.changelog b/kernel.changelog index 85ea1dc14..135c4c283 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,25 @@ +* Mon Jan 08 2024 Fedora Kernel Team [6.7.0-68] +- fedora: aarch64: enable SM_VIDEOCC_8350 (Peter Robinson) +- Linux v6.7.0 +Resolves: + +* Sun Jan 07 2024 Fedora Kernel Team [6.7.0-0.rc8.52b1853b080a.67] +- Linux v6.7.0-0.rc8.52b1853b080a +Resolves: + +* Sat Jan 06 2024 Fedora Kernel Team [6.7.0-0.rc8.95c8a35f1c01.66] +- fedora: arm64: enable ethernet on newer TI industrial (Peter Robinson) +- fedora: arm64: Disable VIDEO_IMX_MEDIA (Peter Robinson) +- fedora: use common config for Siemens Simatic IPC (Peter Robinson) +- fedora: arm: enable Rockchip SPI flash (Peter Robinson) +- fedora: arm64: enable DRM_TI_SN65DSI83 (Peter Robinson) +- Linux v6.7.0-0.rc8.95c8a35f1c01 +Resolves: + +* Fri Jan 05 2024 Fedora Kernel Team [6.7.0-0.rc8.1f874787ed9a.65] +- Linux v6.7.0-0.rc8.1f874787ed9a +Resolves: + * Thu Jan 04 2024 Fedora Kernel Team [6.7.0-0.rc8.ac865f00af29.64] - Linux v6.7.0-0.rc8.ac865f00af29 Resolves: diff --git a/kernel.spec b/kernel.spec index 46ac8abf9..1a282ee58 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc8.20240104gitac865f00af29.64 +%define pkgrelease 68 %define kversion 6 -%define tarfile_release 6.7-rc8-24-gac865f00af29 +%define tarfile_release 6.7 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.20240104gitac865f00af29.64%{?buildid}%{?dist} +%define specrelease 68%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3757,6 +3757,24 @@ fi\ # # %changelog +* Mon Jan 08 2024 Fedora Kernel Team [6.7.0-68] +- fedora: aarch64: enable SM_VIDEOCC_8350 (Peter Robinson) +- Linux v6.7.0 + +* Sun Jan 07 2024 Fedora Kernel Team [6.7.0-0.rc8.52b1853b080a.67] +- Linux v6.7.0-0.rc8.52b1853b080a + +* Sat Jan 06 2024 Fedora Kernel Team [6.7.0-0.rc8.95c8a35f1c01.66] +- fedora: arm64: enable ethernet on newer TI industrial (Peter Robinson) +- fedora: arm64: Disable VIDEO_IMX_MEDIA (Peter Robinson) +- fedora: use common config for Siemens Simatic IPC (Peter Robinson) +- fedora: arm: enable Rockchip SPI flash (Peter Robinson) +- fedora: arm64: enable DRM_TI_SN65DSI83 (Peter Robinson) +- Linux v6.7.0-0.rc8.95c8a35f1c01 + +* Fri Jan 05 2024 Fedora Kernel Team [6.7.0-0.rc8.1f874787ed9a.65] +- Linux v6.7.0-0.rc8.1f874787ed9a + * Thu Jan 04 2024 Fedora Kernel Team [6.7.0-0.rc8.ac865f00af29.64] - Linux v6.7.0-0.rc8.ac865f00af29 diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 4bcf3408d..94e8d52e0 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -127,7 +127,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e1a652205d06..b2741c79c33e 100644 +index c6f549f6a4ae..9d17dd2c3636 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index bb4e9f9ce..c915749dd 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc8-24-gac865f00af29.tar.xz) = d94a94e16398dacbe1933b0f83bb4ba9343103d85349daf3d63d116634a9175e7ae8efd6560c3e779ffe8427dba3467e682f13ed2f5ef5744f98c25b92a3ea9b -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = cfe674761a5226ddb0ce32733409c90a8d9461a53c9f6085ac11245154b6b8cd3c1eecfb7d3b58dc830f1e1a5444a6f35a4faef3f5759fdd3de8644903efd996 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = d55c362e703c23baa7a3c3a016434afc6865883da672356af49716827ab2f01f6bce33df51baa09f9c08232bdfbf36e5b0745cc81a4d2c4db8f8e218b73b3d6e +SHA512 (linux-6.7.tar.xz) = c211ad24aa009cf109de610944b6a2761eb503337bf58ea59f2d71cf2247cacfaf98c3674b3bd770c273647e9ca13e9092213c8e0c65bd7526fbe18410612be4 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 26eb7038afbf57459f16dc7ba6504e3b646f6c9718c9eeab29a6778663d2f28722cef2f7a641121d4d0c034e26be2cbd03406f055d3bca352d0525776613d48d +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 67bdca1352e784064fd0f3e68ddd93854c480fe9648ec2e10953a866086e7644378b74d716e4f28d8903343fded0b4c771e1d2282d43246768835cc44c5fa2b7