1bbd681660
* Thu May 15 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-86.el10]
- ext4: don't over-report free space or inodes in statvfs (CKI Backport Bot) [RHEL-89589]
- redhat: generalize rule for kunit and test kmod placement (Jan Stancek) [RHEL-89085]
- ice: implement low latency PHY timer updates (Petr Oros) [RHEL-74286]
- ice: check low latency PHY timer update firmware capability (Petr Oros) [RHEL-74286]
- ice: add lock to protect low latency interface (Petr Oros) [RHEL-74286]
- ice: rename TS_LL_READ* macros to REG_LL_PROXY_H_* (Petr Oros) [RHEL-74286]
- ice: use read_poll_timeout_atomic in ice_read_phy_tstamp_ll_e810 (Petr Oros) [RHEL-74286]
- Bluetooth: L2CAP: Fix corrupted list in hci_chan_del (David Marlin) [RHEL-87896] {CVE-2025-21969}
- Bluetooth: L2CAP: Fix slab-use-after-free Read in l2cap_send_cmd (CKI Backport Bot) [RHEL-87896] {CVE-2025-21969}
- selftests: tls: check that disconnect does nothing (Sabrina Dubroca) [RHEL-86020]
- net: tls: explicitly disallow disconnect (Sabrina Dubroca) [RHEL-86020]
- tls: skip setting sk_write_space on rekey (Sabrina Dubroca) [RHEL-86020]
- tls: Fix tls_sw_sendmsg error handling (Sabrina Dubroca) [RHEL-86020]
- selftests: tls: add rekey tests (Sabrina Dubroca) [RHEL-86020]
- selftests: tls: add key_generation argument to tls_crypto_info_init (Sabrina Dubroca) [RHEL-86020]
- tls: add counters for rekey (Sabrina Dubroca) [RHEL-86020]
- tls: implement rekey for TLS1.3 (Sabrina Dubroca) [RHEL-86020]
- tls: block decryption when a rekey is pending (Sabrina Dubroca) [RHEL-86020]
- scsi: mpi3mr: Event processing debug improvement (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Add level check to control event logging (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Reset the pending interrupt flag (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Fix pending I/O counter (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Task Abort EH Support (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Update driver version to 8.13.0.5.50 (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Check admin reply queue from Watchdog (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Update timestamp only for supervisor IOCs (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Update MPI Headers to revision 35 (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Fix locking in an error path (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Fix spelling mistake "skiping" -> "skipping" (Chandrakanth Patil) [RHEL-80699]
- scsi: mpi3mr: Support for Segmented Hardware Trace buffer (Chandrakanth Patil) [RHEL-80699]
- locking/semaphore: Use wake_q to wake up processes outside lock critical section (Waiman Long) [RHEL-74462]
Resolves: RHEL-74286, RHEL-74462, RHEL-80699, RHEL-86020, RHEL-87896, RHEL-89085, RHEL-89589
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 = 86
|
|
|
|
#
|
|
# 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
|