diff --git a/Makefile.rhelver b/Makefile.rhelver index 88554b115..201747f5f 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 38 +RHEL_RELEASE = 39 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index ba326ef89..f72add176 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -4321,7 +4321,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 5950e9cfe..afbda4b5e 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -4300,7 +4300,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index da1e01c95..fdf2d42d5 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -4602,7 +4602,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index 9ca02d881..e2650f264 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -4581,7 +4581,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 73d290353..5fcd3ae6a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4318,7 +4318,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8288018c4..4794d8c01 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4297,7 +4297,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index bb3c43c8e..cc91ee931 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -4359,7 +4359,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 041e9c571..e80d18dfb 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -4338,7 +4338,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7b149607e..7e8c35ff9 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3959,7 +3959,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 726ff4227..fe58330f5 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3939,7 +3939,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3ad288d7a..8581d1dd5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3937,7 +3937,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NETIUCV is not set # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 172a2e2bc..e8be8e818 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3917,7 +3917,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NETIUCV is not set # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 2dc044923..ee729eb7f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3926,7 +3926,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NETIUCV is not set # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index 426d07525..f2fc1db4d 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -4328,7 +4328,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index 718eea799..2e34e4e8a 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -4308,7 +4308,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4b95a2025..d36551c61 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4199,7 +4199,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ba0fa8b9d..8d3a10c45 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4179,7 +4179,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index b891801b7..904dfd272 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4240,7 +4240,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index a54c40005..136b0d4d6 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4220,7 +4220,7 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m # CONFIG_NET_KEY is not set -# CONFIG_NETKIT is not set +CONFIG_NETKIT=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=y diff --git a/kernel.changelog b/kernel.changelog index a68f6cea0..f2cc921ab 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,27 @@ +* Thu Jan 09 2025 Jan Stancek [6.12.0-39.el10] +- platform/x86/intel/pmc: Disable C1 auto-demotion during suspend (Steve Best) [RHEL-66570] +- platform/x86/intel/pmc: Refactor platform resume functions to use cnl_resume() (Steve Best) [RHEL-66570] +- redhat/configs: Enable CONFIG_NETKIT for RHEL (Toke Høiland-Jørgensen) [RHEL-51429] +- bnxt_en: Unregister PTP during PCI shutdown and suspend (Michal Schmidt) [RHEL-54644 RHEL-69499] +- bnxt_en: Refactor bnxt_ptp_init() (Michal Schmidt) [RHEL-54644 RHEL-69499] +- bnxt_en: Fix receive ring space parameters when XDP is active (Michal Schmidt) [RHEL-54644] +- bnxt_en: Fix queue start to update vnic RSS table (Michal Schmidt) [RHEL-54644] +- bnxt_en: Set backplane link modes correctly for ethtool (Michal Schmidt) [RHEL-54644] +- bnxt_en: Reserve rings after PCIe AER recovery if NIC interface is down (Michal Schmidt) [RHEL-54644] +- bnxt_en: use irq_update_affinity_hint() (Michal Schmidt) [RHEL-54644] +- bnxt_en: ethtool: Support unset l4proto on ip4/ip6 ntuple rules (Michal Schmidt) [RHEL-54644] +- bnxt_en: ethtool: Remove ip4/ip6 ntuple support for IPPROTO_RAW (Michal Schmidt) [RHEL-54644] +- s390/cio: Externalize full CMG characteristics (Mete Durlu) [RHEL-24140] +- s390/pci: Expose FIDPARM attribute in sysfs (Mete Durlu) [RHEL-71374] +- perf machine: Initialize machine->env to address a segfault (Michael Petlan) [RHEL-70278] +- redhat/kernel.spec.template: Require kernel-tools-libs in rtla (Tomas Glozar) [RHEL-70863] +- rtla/timerlat: Fix histogram ALL for zero samples (Tomas Glozar) [RHEL-72691] +- s390/pci: Fix leak of struct zpci_dev when zpci_add_device() fails (Mete Durlu) [RHEL-24143] +- s390/pci: Ignore RID for isolated VFs (Mete Durlu) [RHEL-24143] +- s390/pci: Use topology ID for multi-function devices (Mete Durlu) [RHEL-24143] +- s390/pci: Sort PCI functions prior to creating virtual busses (Mete Durlu) [RHEL-24143] +Resolves: RHEL-24140, RHEL-24143, RHEL-51429, RHEL-54644, RHEL-66570, RHEL-69499, RHEL-70278, RHEL-70863, RHEL-71374, RHEL-72691 + * Mon Jan 06 2025 Jan Stancek [6.12.0-38.el10] - virtio_ring: add a func argument 'recycle_done' to virtqueue_reset() (Cindy Lu) [RHEL-56981] - virtio_net: ensure netdev_tx_reset_queue is called on tx ring resize (Cindy Lu) [RHEL-56981] diff --git a/kernel.spec b/kernel.spec index 1be12e40d..01686d521 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,15 +162,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 38 +%define pkgrelease 39 %define kversion 6 -%define tarfile_release 6.12.0-38.el10 +%define tarfile_release 6.12.0-39.el10 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 38%{?buildid}%{?dist} +%define specrelease 39%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-38.el10 +%define kabiversion 6.12.0-39.el10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -1315,6 +1315,9 @@ Epoch: %{gemini} Summary: Real-Time Linux Analysis tools Requires: libtraceevent Requires: libtracefs +%ifarch %{cpupowerarchs} +Requires: %{package_name}-tools-libs = %{version}-%{release} +%endif %description -n rtla The rtla meta-tool includes a set of commands that aims to analyze the real-time properties of Linux. Instead of testing Linux as a black box, @@ -4297,6 +4300,29 @@ fi\ # # %changelog +* Thu Jan 09 2025 Jan Stancek [6.12.0-39.el10] +- platform/x86/intel/pmc: Disable C1 auto-demotion during suspend (Steve Best) [RHEL-66570] +- platform/x86/intel/pmc: Refactor platform resume functions to use cnl_resume() (Steve Best) [RHEL-66570] +- redhat/configs: Enable CONFIG_NETKIT for RHEL (Toke Høiland-Jørgensen) [RHEL-51429] +- bnxt_en: Unregister PTP during PCI shutdown and suspend (Michal Schmidt) [RHEL-54644 RHEL-69499] +- bnxt_en: Refactor bnxt_ptp_init() (Michal Schmidt) [RHEL-54644 RHEL-69499] +- bnxt_en: Fix receive ring space parameters when XDP is active (Michal Schmidt) [RHEL-54644] +- bnxt_en: Fix queue start to update vnic RSS table (Michal Schmidt) [RHEL-54644] +- bnxt_en: Set backplane link modes correctly for ethtool (Michal Schmidt) [RHEL-54644] +- bnxt_en: Reserve rings after PCIe AER recovery if NIC interface is down (Michal Schmidt) [RHEL-54644] +- bnxt_en: use irq_update_affinity_hint() (Michal Schmidt) [RHEL-54644] +- bnxt_en: ethtool: Support unset l4proto on ip4/ip6 ntuple rules (Michal Schmidt) [RHEL-54644] +- bnxt_en: ethtool: Remove ip4/ip6 ntuple support for IPPROTO_RAW (Michal Schmidt) [RHEL-54644] +- s390/cio: Externalize full CMG characteristics (Mete Durlu) [RHEL-24140] +- s390/pci: Expose FIDPARM attribute in sysfs (Mete Durlu) [RHEL-71374] +- perf machine: Initialize machine->env to address a segfault (Michael Petlan) [RHEL-70278] +- redhat/kernel.spec.template: Require kernel-tools-libs in rtla (Tomas Glozar) [RHEL-70863] +- rtla/timerlat: Fix histogram ALL for zero samples (Tomas Glozar) [RHEL-72691] +- s390/pci: Fix leak of struct zpci_dev when zpci_add_device() fails (Mete Durlu) [RHEL-24143] +- s390/pci: Ignore RID for isolated VFs (Mete Durlu) [RHEL-24143] +- s390/pci: Use topology ID for multi-function devices (Mete Durlu) [RHEL-24143] +- s390/pci: Sort PCI functions prior to creating virtual busses (Mete Durlu) [RHEL-24143] + * Mon Jan 06 2025 Jan Stancek [6.12.0-38.el10] - virtio_ring: add a func argument 'recycle_done' to virtqueue_reset() (Cindy Lu) [RHEL-56981] - virtio_net: ensure netdev_tx_reset_queue is called on tx ring resize (Cindy Lu) [RHEL-56981] diff --git a/sources b/sources index d1f380ed0..292c12650 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.12.0-38.el10.tar.xz) = 6d2170e49cdfb33b1927d13fb1335c889c7c8011bce329a858f291a6d934e425b5ba5984c4ae2518677533c7a673b061a89932d138fca918241884065d8a9f7a -SHA512 (kernel-abi-stablelists-6.12.0-38.el10.tar.xz) = ddb298c7031b551c66ea3091843ed318930e7a960880811274c8635a3f62ba5279896ee6a5154e9d6726fd44415a864344bc1127e4683070f7b954d02216e0b2 -SHA512 (kernel-kabi-dw-6.12.0-38.el10.tar.xz) = b29662f01473b3f19e94bfdd2f7745b3ec156df461bb39400b43762bce8d826a7131ed0406f1d64c4a1fd5f0211e72470522270aa4debc2f9502aec12b317b13 +SHA512 (linux-6.12.0-39.el10.tar.xz) = aeeb90e4b9a8846aa6c9aab85a764557242f403be1b3f5e9cab37d93f8e240e144982fb90761ad5e93a632d95f834cdf72fe7e1ef948e827139b09ba6d2315cc +SHA512 (kernel-abi-stablelists-6.12.0-39.el10.tar.xz) = ee34461fa5e85bf11ed8e6356347d7cc254410b4735c0765ad016ed8cdc57bc5c18f95023a1eed9be6c560b9c32c10b7358890c3ca1208f72c0892ec62d3b8a7 +SHA512 (kernel-kabi-dw-6.12.0-39.el10.tar.xz) = 03529afc24efbf85103e291dfe87bcc049f126ed3e8632960e9ba4b6d373a9895df63b3d75b636c7f45451049474f12c9b8c03290b0501389d5183d370f72942