5a30e7bf4d
* Tue Jun 17 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-98.el10]
- fs/file.c: add fast path in find_next_fd() (Ian Kent) [RHEL-38569]
- fs/file.c: conditionally clear full_fds (Ian Kent) [RHEL-38569]
- fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd() (Ian Kent) [RHEL-38569]
- redhat/kernel.spec: drop modules-extra-matched for noarch (Jan Stancek) [RHEL-95740]
- tracing/osnoise: Allow arbitrarily long CPU string (Tomas Glozar) [RHEL-86520]
- RDMA/irdma: Remove deliver net device event (Kamal Heib) [RHEL-87577]
- RDMA/irdma: Remove unused irdma_cqp_*_fpm_val_cmd functions (Kamal Heib) [RHEL-87577]
- ovl: don't require "metacopy=on" for "verity" (Miklos Szeredi) [RHEL-82858]
- ovl: relax redirect/metacopy requirements for lower -> data redirect (Miklos Szeredi) [RHEL-82858]
- ovl: make redirect/metacopy rejection consistent (Miklos Szeredi) [RHEL-82858]
- ovl: remove unused forward declaration (Miklos Szeredi) [RHEL-82858]
- ovl: don't allow datadir only (Miklos Szeredi) [RHEL-82858]
- smb: client: fix UAF in decryption with multichannel (CKI Backport Bot) [RHEL-94466] {CVE-2025-37750}
- Merge DRM changes from upstream v6.13..v6.14 (José Expósito) [RHEL-75957]
- Merge DRM changes from upstream v6.12..v6.13 (José Expósito) [RHEL-75957]
- selftests/bpf: lwt_seg6local: Move test to test_progs (Hangbin Liu) [RHEL-82844]
- selftests/bpf: lwt_seg6local: Remove unused routes (Hangbin Liu) [RHEL-82844]
- selftests/bpf: add missing header include for htons (Hangbin Liu) [RHEL-82844]
Resolves: RHEL-38569, RHEL-75957, RHEL-82844, RHEL-82858, RHEL-86520, RHEL-87577, RHEL-94466, RHEL-95740
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 = 98
|
|
|
|
#
|
|
# 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
|