f5b2a5f2ae
* Fri Mar 28 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-69.el10]
- redhat/configs: Enable CONFIG_BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
- block/Kconfig: Allow selecting BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
- perf script: Fix hangup in offline flamegraph report (Michael Petlan) [RHEL-57021]
- perf script: force stdin for flamegraph in live mode (Michael Petlan) [RHEL-57021]
- smb: client: fix regression with guest option (Paulo Alcantara) [RHEL-83856]
- KVM: selftests: Allow running a single iteration of dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Fix an off-by-one in the number of dirty_log_test iterations (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Set per-iteration variables at the start of each iteration (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Tighten checks around prev iter's last dirty page in ring (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Ensure guest writes min number of pages in dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: sefltests: Verify value of dirty_log_test last page isn't bogus (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Collect *all* dirty entries in each dirty_log_test iteration (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Print (previous) last_page on dirty page value mismatch (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Post to sem_vcpu_stop if and only if vcpu_stop is true (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Keep dirty_log_test vCPU in guest until it needs to stop (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Honor "stop" request in dirty ring test (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Limit dirty_log_test's s390x workaround to s390x (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Continuously reap dirty ring while vCPU is running (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Read per-page value into local var when verifying dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Precisely track number of dirty/clear pages for each iteration (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Drop stale srandom() initialization from dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Drop signal/kick from dirty ring testcase (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Sync dirty_log_test iteration to guest *before* resuming (Maxim Levitsky) [RHEL-58941]
- KVM: selftests: Support multiple write retires in dirty_log_test (Maxim Levitsky) [RHEL-58941]
- KVM: VMX: read the PML log in the same order as it was written (Maxim Levitsky) [RHEL-58941]
- KVM: VMX: refactor PML terminology (Maxim Levitsky) [RHEL-58941]
- crypto: pcrypt - Call crypto layer directly when padata_do_parallel() return -EBUSY (Herbert Xu) [RHEL-80114] {CVE-2024-56690}
- erofs: fix blksize < PAGE_SIZE for file-backed mounts (Ian Kent) [RHEL-82421] {CVE-2024-56750}
- platform/x86/intel/vsec: Add support for Panther Lake (Steve Best) [RHEL-47411]
- bonding: report duplicate MAC address in all situations (Hangbin Liu) [RHEL-73803]
- ice: Fix signedness bug in ice_init_interrupt_scheme() (Petr Oros) [RHEL-80554]
- ice: init flow director before RDMA (Petr Oros) [RHEL-80554]
- ice: simplify VF MSI-X managing (Petr Oros) [RHEL-80554]
- ice: enable_rdma devlink param (Petr Oros) [RHEL-80554]
- ice: treat dyn_allowed only as suggestion (Petr Oros) [RHEL-80554]
- ice, irdma: move interrupts code to irdma (Petr Oros) [RHEL-80554]
- ice: get rid of num_lan_msix field (Petr Oros) [RHEL-80554]
- ice: remove splitting MSI-X between features (Petr Oros) [RHEL-80554]
- ice: devlink PF MSI-X max and min parameter (Petr Oros) [RHEL-80554]
- ice: ice_probe: init ice_adapter after HW init (Petr Oros) [RHEL-80554]
- ice: minor: rename goto labels from err to unroll (Petr Oros) [RHEL-80554]
- ice: split ice_init_hw() out from ice_init_dev() (Petr Oros) [RHEL-80554]
- ice: c827: move wait for FW to ice_init_hw() (Petr Oros) [RHEL-80554]
- ipv6: use RCU protection in ip6_default_advmss() (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
- net: add dev_net_rcu() helper (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
- objtool: Add bch2_trans_unlocked_error() to bcachefs noreturns (Radomir Vrbovsky) [RHEL-80715]
- objtool: Exclude __tracepoints data from ENDBR checks (Radomir Vrbovsky) [RHEL-80715]
- kbuild: Add Propeller configuration for kernel build (Radomir Vrbovsky) [RHEL-80715]
- AutoFDO: Enable machine function split optimization for AutoFDO (Radomir Vrbovsky) [RHEL-80715]
- AutoFDO: Enable -ffunction-sections for the AutoFDO build (Radomir Vrbovsky) [RHEL-80715]
- vmlinux.lds.h: Add markers for text_unlikely and text_hot sections (Radomir Vrbovsky) [RHEL-80715]
- openrisc: place exception table at the head of vmlinux (Radomir Vrbovsky) [RHEL-80715]
- vmlinux.lds.h: Adjust symbol ordering in text output section (Radomir Vrbovsky) [RHEL-80715]
- objtool: Fix unreachable instruction warnings for weak functions (Radomir Vrbovsky) [RHEL-80715]
- kbuild: Add AutoFDO support for Clang build (Radomir Vrbovsky) [RHEL-80715]
- reiserfs: The last commit (Radomir Vrbovsky) [RHEL-80715]
- objtool: Also include tools/include/uapi (Radomir Vrbovsky) [RHEL-80715]
- objtool: Detect non-relocated text references (Radomir Vrbovsky) [RHEL-80715]
- arch/x86/kernel/setup.c: fix rh_check_supported (Tomas Henzl) [RHEL-80866]
- intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly (Steve Best) [RHEL-79459]
- intel_idle: add Clearwater Forest SoC support (Steve Best) [RHEL-79459]
- selftests: fib_nexthops: do not mark skipped tests as failed (Hangbin Liu) [RHEL-80288]
Resolves: RHEL-47411, RHEL-57021, RHEL-58941, RHEL-73803, RHEL-79459, RHEL-79711, RHEL-80114, RHEL-80288, RHEL-80554, RHEL-80715, RHEL-80866, RHEL-81574, RHEL-82421, RHEL-83856
Signed-off-by: Julio Faracco <jfaracco@redhat.com>
81 lines
2.6 KiB
Makefile
81 lines
2.6 KiB
Makefile
RHEL_MAJOR = 10
|
|
RHEL_MINOR = 1
|
|
|
|
#
|
|
# RHEL_RELEASE
|
|
# -------------
|
|
#
|
|
# Represents build number in 'release' part of RPM's name-version-release.
|
|
# name is <package_name>, e.g. kernel
|
|
# version is upstream kernel version this kernel is based on, e.g. 4.18.0
|
|
# release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8
|
|
#
|
|
# Use this spot to avoid future merge conflicts.
|
|
# Do not trim this comment.
|
|
RHEL_RELEASE = 69
|
|
|
|
#
|
|
# RHEL_REBASE_NUM
|
|
# ----------------
|
|
#
|
|
# Used in RPM version string for Gemini kernels, which dont use upstream
|
|
# VERSION/PATCHLEVEL/SUBLEVEL. The number represents rebase number for
|
|
# current MAJOR release.
|
|
#
|
|
# Use this spot to avoid future merge conflicts.
|
|
# Do not trim this comment.
|
|
RHEL_REBASE_NUM = 1
|
|
|
|
|
|
#
|
|
# ZSTREAM
|
|
# -------
|
|
#
|
|
# This variable controls whether we use zstream numbering or not for the
|
|
# package release. The zstream release keeps the build number of the last
|
|
# build done for ystream for the Beta milestone, and increments a second
|
|
# number for each build. The third number is used for branched builds
|
|
# (eg.: for builds with security fixes or hot fixes done outside of the
|
|
# batch release process).
|
|
#
|
|
# For example, with ZSTREAM unset or set to "no", all builds will contain
|
|
# a release with only the build number, eg.: kernel-<kernel version>-X.el*,
|
|
# where X is the build number. With ZSTREAM set to "yes", we will have
|
|
# builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
|
|
# RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
|
|
# build number and Z will always be 1 except if you're doing a branched build
|
|
# (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
|
|
# number will be incremented instead of the Y).
|
|
#
|
|
ZSTREAM ?= no
|
|
|
|
#
|
|
# Early y+1 numbering
|
|
# --------------------
|
|
#
|
|
# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
|
|
# First is RHEL_RELEASE inherited/merged from y as-is, second number
|
|
# is incremented with each build starting from 1. After merge from y,
|
|
# it resets back to 1. This way y+1 nvr reflects status of last merge.
|
|
#
|
|
# Example:
|
|
#
|
|
# rhel8.0 rhel-8.1
|
|
# kernel-4.18.0-58.el8 --> kernel-4.18.0-58.1.el8
|
|
# kernel-4.18.0-58.2.el8
|
|
# kernel-4.18.0-59.el8 kernel-4.18.0-59.1.el8
|
|
# kernel-4.18.0-60.el8
|
|
# kernel-4.18.0-61.el8 --> kernel-4.18.0-61.1.el8
|
|
#
|
|
#
|
|
# Use this spot to avoid future merge conflicts.
|
|
# Do not trim this comment.
|
|
EARLY_YSTREAM ?= no
|
|
EARLY_YBUILD:=
|
|
EARLY_YRELEASE:=
|
|
ifneq ("$(ZSTREAM)", "yes")
|
|
ifeq ("$(EARLY_YSTREAM)","yes")
|
|
RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
|
|
endif
|
|
endif
|