50a40ae7be
* Fri Jul 04 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-106.el10]
- net: use sock_gen_put() when sk_state is TCP_TIME_WAIT (Paolo Abeni) [RHEL-96601]
- block: use plug request list tail for one-shot backmerge attempt (Ming Lei) [RHEL-96294]
- exfat: fix random stack corruption after get_block (CKI Backport Bot) [RHEL-99440] {CVE-2025-22036}
- rtmutex_api: provide correct extern functions (Maxim Levitsky) [RHEL-74410]
- rust: add helper for mutex_trylock (Maxim Levitsky) [RHEL-74410]
- RISC-V: KVM: use kvm_trylock_all_vcpus when locking all vCPUs (Maxim Levitsky) [RHEL-74410]
- KVM: arm64: use kvm_trylock_all_vcpus when locking all vCPUs (Maxim Levitsky) [RHEL-74410]
- x86: KVM: SVM: use kvm_lock_all_vcpus instead of a custom implementation (Maxim Levitsky) [RHEL-74410]
- KVM: add kvm_lock_all_vcpus and kvm_trylock_all_vcpus (Maxim Levitsky) [RHEL-74410]
- locking/mutex: implement mutex_lock_killable_nest_lock (Maxim Levitsky) [RHEL-74410]
- locking/mutex: implement mutex_trylock_nested (Maxim Levitsky) [RHEL-74410]
- cdc_ether|r8152: ThinkPad Hybrid USB-C/A Dock quirk (CKI Backport Bot) [RHEL-72661]
- selftests: bonding: add ipvlan over bond testing (CKI Backport Bot) [RHEL-96617]
- selftests: net: lib: Add a couple autodefer helpers (CKI Backport Bot) [RHEL-96617]
- selftests: net: lib: Add several autodefer helpers (CKI Backport Bot) [RHEL-96617]
- selftests: net: lib: Rename ip_link_master() to ip_link_set_master() (CKI Backport Bot) [RHEL-96617]
- bonding: Fix multiple long standing offload races (Hangbin Liu) [RHEL-73802]
- bonding: Mark active offloaded xfrm_states (Hangbin Liu) [RHEL-73802]
- xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free} (Hangbin Liu) [RHEL-73802]
- xfrm: Remove unneeded device check from validate_xmit_xfrm (Hangbin Liu) [RHEL-73802]
- xfrm: Use xdo.dev instead of xdo.real_dev (Hangbin Liu) [RHEL-73802]
- net/mlx5: Avoid using xso.real_dev unnecessarily (Hangbin Liu) [RHEL-73802]
- xfrm: always initialize offload path (Hangbin Liu) [RHEL-73802]
- xfrm: check for PMTU in tunnel mode for packet offload (Hangbin Liu) [RHEL-73802]
- xfrm: provide common xdo_dev_offload_ok callback implementation (Hangbin Liu) [RHEL-73802]
- xfrm: rely on XFRM offload (Hangbin Liu) [RHEL-73802 RHEL-97184]
- xfrm: simplify SA initialization routine (Hangbin Liu) [RHEL-73802]
- xfrm: delay initialization of offload path till its actually requested (Hangbin Liu) [RHEL-73802]
- ynl: devlink: add missing board-serial-number (Petr Oros) [RHEL-75601]
- devlink: fix xa_alloc_cyclic() error handling (Petr Oros) [RHEL-75601]
- devlink: add devl guard (Petr Oros) [RHEL-75601]
- pldmfw: enable selected component update (Petr Oros) [RHEL-75601]
- devlink: Improve the port attributes description (Petr Oros) [RHEL-75601]
- devlink: add devlink_fmsg_dump_skb() function (Petr Oros) [RHEL-75601]
- devlink: add devlink_fmsg_put() macro (Petr Oros) [RHEL-75601]
- devlink: Add documentation for OcteonTx2 AF (Petr Oros) [RHEL-75601]
- devlink: remove unused devlink_resource_register() (Petr Oros) [RHEL-75601]
- devlink: remove unused devlink_resource_occ_get_register() and _unregister() (Petr Oros) [RHEL-75601]
- net: dsa: replace devlink resource registration calls by devl_ variants (Petr Oros) [RHEL-75601]
- devlink: region: snapshot IDs: consolidate error values (Petr Oros) [RHEL-75601]
- devlink: devl_resource_register(): differentiate error codes (Petr Oros) [RHEL-75601]
- devlink: use devlink_nl_put_u64() helper (Petr Oros) [RHEL-75601]
- devlink: introduce devlink_nl_put_u64() (Petr Oros) [RHEL-75601]
- tools: ynl-gen: use names of constants in generated limits (Petr Oros) [RHEL-75601]
- tools: ynl-gen: refactor check validation for TypeBinary (Petr Oros) [RHEL-75601]
- ice: Add correct PHY lane assignment (Petr Oros) [RHEL-74388]
- ice: Fix ETH56G FC-FEC Rx offset value (Petr Oros) [RHEL-74388]
- ice: Fix quad registers read on E825 (Petr Oros) [RHEL-74388]
- ice: Fix E825 initialization (Petr Oros) [RHEL-74388]
Resolves: RHEL-72661, RHEL-73802, RHEL-74388, RHEL-74410, RHEL-75601, RHEL-96294, RHEL-96601, RHEL-96617, RHEL-97184, RHEL-99440
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 = 106
|
|
|
|
#
|
|
# 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
|