Merge branch 'c10s' into a10s

This commit is contained in:
eabdullin 2025-01-08 12:47:53 +03:00
commit 139671a624
12 changed files with 98 additions and 16 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 = 35
RHEL_RELEASE = 37
#
# RHEL_REBASE_NUM

View File

@ -2563,7 +2563,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -2547,7 +2547,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -2731,7 +2731,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
# CONFIG_HP_WATCHDOG is not set
# CONFIG_HSA_AMD_P2P is not set
CONFIG_HSA_AMD_SVM=y

View File

@ -2715,7 +2715,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
# CONFIG_HP_WATCHDOG is not set
# CONFIG_HSA_AMD_P2P is not set
CONFIG_HSA_AMD_SVM=y

View File

@ -2560,7 +2560,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -2544,7 +2544,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -2601,7 +2601,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -2585,7 +2585,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
# CONFIG_HPFS_FS is not set
# CONFIG_HP_ILO is not set
CONFIG_HP_ILO=m
CONFIG_HP_WATCHDOG=m
CONFIG_HSA_AMD_P2P=y
CONFIG_HSA_AMD_SVM=y

View File

@ -1,3 +1,45 @@
* 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]
- i40e: Fix handling changed priv flags (Kamal Heib) [RHEL-69737]
- RHEL-only: mark ublk as tech preview (Ming Lei) [RHEL-50740]
- Revert "block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator()" (Ming Lei) [RHEL-67720]
- block: sed-opal: add ioctl IOC_OPAL_SET_SID_PW (Ming Lei) [RHEL-70861]
- loop: fix type of block size (Ming Lei) [RHEL-65631]
- x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC (Phil Auld) [RHEL-70901]
- sched/deadline: Fix warning in migrate_enable for boosted tasks (Phil Auld) [RHEL-70901]
- sched/core: Prevent wakeup of ksoftirqd during idle load balance (Phil Auld) [RHEL-70901]
- sched/fair: Check idle_cpu() before need_resched() to detect ilb CPU turning busy (Phil Auld) [RHEL-70901]
- sched/core: Remove the unnecessary need_resched() check in nohz_csd_func() (Phil Auld) [RHEL-70901]
- sched: fix warning in sched_setaffinity (Phil Auld) [RHEL-70901]
- softirq: Allow raising SCHED_SOFTIRQ from SMP-call-function on RT kernel (Phil Auld) [RHEL-70901]
- sched/deadline: Fix replenish_dl_new_period dl_server condition (Phil Auld) [RHEL-70901]
- vfio/mlx5: Align the page tracking max message size with the device capability (CKI Backport Bot) [RHEL-69932]
- tools/rtla: Improve exception handling in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: Enhance argument parsing in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: Improve code readability in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Do not set params->user_workload with -U (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Make timerlat_hist_cpu->*_count unsigned long long (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Make timerlat_top_cpu->*_count unsigned long long (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: drop __NR_sched_getattr (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla: Fix consistency in getopt_long for timerlat_hist (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla: use the definition for stdout fd when calling isatty() (Luis Claudio R. Goncalves) [RHEL-69739]
- x86/cacheinfo: Delete global num_cache_leaves (David Arcari) [RHEL-22703]
- cacheinfo: Allocate memory during CPU hotplug if not done from the primary CPU (David Arcari) [RHEL-22703]
Resolves: RHEL-22703, RHEL-50740, RHEL-65631, RHEL-67720, RHEL-69737, RHEL-69739, RHEL-69747, RHEL-69932, RHEL-70861, RHEL-70901
* Tue Dec 17 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-36.el10]
- configs: synchronize CONFIG_HP_ILO between flavors & enable on x86/arm (Charles Mirabile) [RHEL-65590]
- crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70652]
- s390/virtio_ccw: Fix dma_parm pointer not set up (Thomas Huth) [RHEL-69815]
- fsnotify: fix sending inotify event with unexpected filename (Ian Kent) [RHEL-68847]
- Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: decouple basic ANA log page re-read support from native multipathing" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: nvme_mpath_init remove multipath check" (Benjamin Marzinski) [RHEL-68140]
Resolves: RHEL-65590, RHEL-68140, RHEL-68847, RHEL-69815, RHEL-70652
* Fri Dec 13 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-35.el10]
- redhat: gating.yaml: drop unstable test (Jan Stancek)
- CI: provide pipelines for automotive variant (Julio Faracco)

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 35
%define pkgrelease 37
%define kversion 6
%define tarfile_release 6.12.0-35.el10
%define tarfile_release 6.12.0-37.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 35%{?buildid}%{?dist}
%define specrelease 37%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0-35.el10
%define kabiversion 6.12.0-37.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -4340,6 +4340,46 @@ fi\
#
#
%changelog
* 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]
- i40e: Fix handling changed priv flags (Kamal Heib) [RHEL-69737]
- RHEL-only: mark ublk as tech preview (Ming Lei) [RHEL-50740]
- Revert "block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator()" (Ming Lei) [RHEL-67720]
- block: sed-opal: add ioctl IOC_OPAL_SET_SID_PW (Ming Lei) [RHEL-70861]
- loop: fix type of block size (Ming Lei) [RHEL-65631]
- x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC (Phil Auld) [RHEL-70901]
- sched/deadline: Fix warning in migrate_enable for boosted tasks (Phil Auld) [RHEL-70901]
- sched/core: Prevent wakeup of ksoftirqd during idle load balance (Phil Auld) [RHEL-70901]
- sched/fair: Check idle_cpu() before need_resched() to detect ilb CPU turning busy (Phil Auld) [RHEL-70901]
- sched/core: Remove the unnecessary need_resched() check in nohz_csd_func() (Phil Auld) [RHEL-70901]
- sched: fix warning in sched_setaffinity (Phil Auld) [RHEL-70901]
- softirq: Allow raising SCHED_SOFTIRQ from SMP-call-function on RT kernel (Phil Auld) [RHEL-70901]
- sched/deadline: Fix replenish_dl_new_period dl_server condition (Phil Auld) [RHEL-70901]
- vfio/mlx5: Align the page tracking max message size with the device capability (CKI Backport Bot) [RHEL-69932]
- tools/rtla: Improve exception handling in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: Enhance argument parsing in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: Improve code readability in timerlat_load.py (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Do not set params->user_workload with -U (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Make timerlat_hist_cpu->*_count unsigned long long (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla/timerlat: Make timerlat_top_cpu->*_count unsigned long long (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Luis Claudio R. Goncalves) [RHEL-69739]
- tools/rtla: drop __NR_sched_getattr (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla: Fix consistency in getopt_long for timerlat_hist (Luis Claudio R. Goncalves) [RHEL-69739]
- rtla: use the definition for stdout fd when calling isatty() (Luis Claudio R. Goncalves) [RHEL-69739]
- x86/cacheinfo: Delete global num_cache_leaves (David Arcari) [RHEL-22703]
- cacheinfo: Allocate memory during CPU hotplug if not done from the primary CPU (David Arcari) [RHEL-22703]
* Tue Dec 17 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-36.el10]
- configs: synchronize CONFIG_HP_ILO between flavors & enable on x86/arm (Charles Mirabile) [RHEL-65590]
- crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70652]
- s390/virtio_ccw: Fix dma_parm pointer not set up (Thomas Huth) [RHEL-69815]
- fsnotify: fix sending inotify event with unexpected filename (Ian Kent) [RHEL-68847]
- Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: decouple basic ANA log page re-read support from native multipathing" (Benjamin Marzinski) [RHEL-68140]
- Revert "nvme: nvme_mpath_init remove multipath check" (Benjamin Marzinski) [RHEL-68140]
* Fri Dec 13 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-35.el10]
- redhat: gating.yaml: drop unstable test (Jan Stancek)
- CI: provide pipelines for automotive variant (Julio Faracco)

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-35.el10.tar.xz) = d2a14edbee618383a966b52f67ec1b1c8f8e6228182296affff3699fe11f29cc7b3e7fffeaae2924ff8e12acd5960f577bded0b0f823ce13945f220ea38ad6aa
SHA512 (kernel-abi-stablelists-6.12.0-35.el10.tar.xz) = 1265f5afcfa7bb4d8d515ab41e4b98558005750eaf85dbbee043cbea8c451c4d972dbf77c19f7de1ce2cf0062664d1e3d0cf62f673d453b5822bc3919877f26d
SHA512 (kernel-kabi-dw-6.12.0-35.el10.tar.xz) = f243486b1670da339d68aa999a5c0bacbba5fe1119420cd089271a68c8777514f54ade656164827a6b83499113a4c3795dc489ac65df48e91ab7e099c051c5a0
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