diff --git a/Makefile.rhelver b/Makefile.rhelver index 70acfeb2a..4ceadcd43 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 = 6 +RHEL_RELEASE = 8 # # RHEL_REBASE_NUM diff --git a/filter-modules.sh.rhel b/filter-modules.sh.rhel index d755b52fb..b899ad62c 100755 --- a/filter-modules.sh.rhel +++ b/filter-modules.sh.rhel @@ -39,7 +39,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215 drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via " -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor video apple_bl kasan_test intel-m10-bmc-hwmon" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor video apple_bl kasan_test intel-m10-bmc-hwmon dell-smm-hwmon" # Grab the arch-specific filter list overrides source ./filter-$2.sh diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index ffc663f4d..5a0738889 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2864,7 +2864,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index d3c8ff5cf..6102751c1 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2848,7 +2848,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a284cfd44..28da17d70 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2860,7 +2860,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 32a07b87a..f9199300f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2844,7 +2844,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 03efdcb11..aa195bb33 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2900,7 +2900,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 197f5e5a1..09b05bc2b 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2884,7 +2884,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index bccab9cc3..15b11d147 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2551,7 +2551,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a742ee855..20c323ce5 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2535,7 +2535,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index a9b27c888..1de4b9c43 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2535,7 +2535,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 0ff8c35f2..6c4d633c4 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2519,7 +2519,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 7b9f160ba..e1becc7ef 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2527,7 +2527,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 9cba07d87..246e03e54 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2705,7 +2705,7 @@ CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISHTP_ECLITE=m # CONFIG_INTEL_LDMA is not set CONFIG_INTEL_MEI_GSC=m -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index efe41078f..3f69b0ac0 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2689,7 +2689,7 @@ CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISHTP_ECLITE=m # CONFIG_INTEL_LDMA is not set CONFIG_INTEL_MEI_GSC=m -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 5577b41db..798b8da7e 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2745,7 +2745,7 @@ CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISHTP_ECLITE=m # CONFIG_INTEL_LDMA is not set CONFIG_INTEL_MEI_GSC=m -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 1752be1dd..0f74acea2 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2729,7 +2729,7 @@ CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISHTP_ECLITE=m # CONFIG_INTEL_LDMA is not set CONFIG_INTEL_MEI_GSC=m -# CONFIG_INTEL_MEI_GSC_PROXY is not set +CONFIG_INTEL_MEI_GSC_PROXY=m # CONFIG_INTEL_MEI_HDCP is not set CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m diff --git a/kernel.changelog b/kernel.changelog index 276fbd4ea..b70d4de2f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,17 @@ +* Tue Jan 16 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.8] +- redhat: filter-modules.sh.rhel: add dell-smm-hwmon (Scott Weaver) +Resolves: + +* Tue Jan 16 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.7] +- Add CONFIG_INTEL_MEI_GSC_PROXY=m for DRM 9.4 stable backport (Mika Penttilä) +- Set configs for ZRAM_TRACK_ENTRY_ACTIME (Justin M. Forbes) +- Add python3-pyyaml to buildreqs for kernel-docs (Justin M. Forbes) +- Add nb7vpq904m to singlemods for ppc64le (Thorsten Leemhuis) +- include drm bridge helpers in kernel-core package (Thorsten Leemhuis) +- Add dell-smm-hwmon to singlemods (Thorsten Leemhuis) +- Add drm_gem_shmem_test to mod-internal.list (Thorsten Leemhuis) +Resolves: + * Sat Jan 13 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.6] - Linux v6.8.0-0.rc0.052d534373b7 Resolves: diff --git a/kernel.spec b/kernel.spec index 1dd05a09e..0db1d0c48 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc0.20240113git052d534373b7.6 +%define pkgrelease 0.rc0.20240116git052d534373b7.8 %define kversion 6 %define tarfile_release 6.7-9928-g052d534373b7 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240113git052d534373b7.6%{?buildid}%{?dist} +%define specrelease 0.rc0.20240116git052d534373b7.8%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -3767,7 +3767,12 @@ fi\ # # %changelog -* Mon Jan 15 2024 Justin M. Forbes [6.8.0-0.rc0.20240113git052d534373b7.6] +* Tue Jan 16 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.8] +- redhat: filter-modules.sh.rhel: add dell-smm-hwmon (Scott Weaver) + +* Tue Jan 16 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.7] +- Add CONFIG_INTEL_MEI_GSC_PROXY=m for DRM 9.4 stable backport (Mika Penttilä) +- Set configs for ZRAM_TRACK_ENTRY_ACTIME (Justin M. Forbes) - Add python3-pyyaml to buildreqs for kernel-docs (Justin M. Forbes) - Add nb7vpq904m to singlemods for ppc64le (Thorsten Leemhuis) - include drm bridge helpers in kernel-core package (Thorsten Leemhuis) diff --git a/sources b/sources index 1a762833d..9c86f5b43 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-9928-g052d534373b7.tar.xz) = fc10310bde268106082b9df5d4a62551ebea52329cf3528be94304d5588a1935b7322137f14709ccb6423eddb834bc6d27deee5939abc6eee3ccb539a7a7ef34 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 5205b256423e0576a838691cab79c936be064c32055356127e394429348ff674fafb493b02bfd27854fa545ee0529a9a67ea4349649c9db527f5a406ac295026 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = eef613b5d60f8e86d35efd6a39bcd9bc4d393daf8ff76fae91de66849e9906725cabd044e8fc43044a67d84c2d8bdfa2f1e9c2b51974554fc91b76e741411d78 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 94c351414450875a1a368ae703c32095e0d65757c9fd2183a68a2d17c1784e0b9675e2fb950424d223d1d5eee74625dfe28d127f5a69de4d78d7511ae7d05b34 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = e4b91d56c66dfc99f7cdc7cbd0b9bf6d1c6a340409798a68a02171485aabf14c6f18677286fda7d76b34d0ee1cabeb732f56236fc95f8c4cdce5f6c074f9947c