Merge branch 'c10s' into a10s

This commit is contained in:
eabdullin 2025-01-16 11:56:49 +03:00
commit 352fab0588
23 changed files with 102 additions and 27 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 0
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 37
RHEL_RELEASE = 39
#
# RHEL_REBASE_NUM

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,40 @@
* Thu Jan 09 2025 Jan Stancek <jstancek@redhat.com> [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 <jstancek@redhat.com> [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]
- virtio_ring: add a func argument 'recycle_done' to virtqueue_resize() (Cindy Lu) [RHEL-56981]
- virtio_net: correct netdev_tx_reset_queue() invocation point (Cindy Lu) [RHEL-56981]
- intel_idle: add Granite Rapids Xeon D support (David Arcari) [RHEL-68122]
- sched/dlserver: Fix dlserver time accounting (Phil Auld) [RHEL-68342]
- sched/dlserver: Fix dlserver double enqueue (Phil Auld) [RHEL-68342]
- sched/fair: Fix NEXT_BUDDY (Phil Auld) [RHEL-68342]
- sched/fair: Fix sched_can_stop_tick() for fair tasks (Phil Auld) [RHEL-68342]
- sched/eevdf: More PELT vs DELAYED_DEQUEUE (Phil Auld) [RHEL-68342]
Resolves: RHEL-56981, RHEL-68122, RHEL-68342
* Fri Dec 20 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-37.el10]
- vfio/mlx5: Fix unwind flows in mlx5vf_pci_save/resume_device_data() (Alex Williamson) [RHEL-69747]
- vfio/mlx5: Fix an unwind issue in mlx5vf_add_migration_pages() (Alex Williamson) [RHEL-69747]

View File

@ -164,15 +164,15 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0
%define specversion 6.12.0
%define patchversion 6.12
%define pkgrelease 37
%define pkgrelease 39
%define kversion 6
%define tarfile_release 6.12.0-37.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 37%{?buildid}%{?dist}
%define specrelease 39%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0-37.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
@ -1343,6 +1343,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,
@ -4340,6 +4343,41 @@ fi\
#
#
%changelog
* Thu Jan 09 2025 Jan Stancek <jstancek@redhat.com> [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 <jstancek@redhat.com> [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]
- virtio_ring: add a func argument 'recycle_done' to virtqueue_resize() (Cindy Lu) [RHEL-56981]
- virtio_net: correct netdev_tx_reset_queue() invocation point (Cindy Lu) [RHEL-56981]
- intel_idle: add Granite Rapids Xeon D support (David Arcari) [RHEL-68122]
- sched/dlserver: Fix dlserver time accounting (Phil Auld) [RHEL-68342]
- sched/dlserver: Fix dlserver double enqueue (Phil Auld) [RHEL-68342]
- sched/fair: Fix NEXT_BUDDY (Phil Auld) [RHEL-68342]
- sched/fair: Fix sched_can_stop_tick() for fair tasks (Phil Auld) [RHEL-68342]
- sched/eevdf: More PELT vs DELAYED_DEQUEUE (Phil Auld) [RHEL-68342]
* Fri Dec 20 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-37.el10]
- vfio/mlx5: Fix unwind flows in mlx5vf_pci_save/resume_device_data() (Alex Williamson) [RHEL-69747]
- vfio/mlx5: Fix an unwind issue in mlx5vf_add_migration_pages() (Alex Williamson) [RHEL-69747]

View File

@ -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-37.el10.tar.xz) = 07f3541064964aa54f697c390c7a0d1ec26c587ec406e3d3e8c8eab5670189ec45d6ad407d0a2f58dcdf33b44359366cae27d57c49a9b9fd51024b31d1e0f7dc
SHA512 (kernel-abi-stablelists-6.12.0-37.el10.tar.xz) = 9a8029a25816f83acc35eeeb0352db70a8c9fb78e5307b22c711fbb7532aac68417131b35365a25e1abd0ec8d07b01dd718aeeef20159c21933b4c58f4ef2ef3
SHA512 (kernel-kabi-dw-6.12.0-37.el10.tar.xz) = b3525532603299a3c22dc64150f1431e20b30b742bb67abc5815465575adfe9977b7e49d03bbc0ac4ef2271288c3d04c0d05e2049b6afc98b47bf9c78185343e
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