forked from rpms/kernel
b48fa01cf4
* Wed May 14 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-85.el10]
- selftests/net: packetdrill: more xfail changes (and a correction) (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: make tcp buf limited timing tests benign (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: report benign debug flakes as xfail (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: import tcp/user_timeout, tcp/validate, tcp/sendfile, tcp/limited-transmit, tcp/syscall_bad_arg (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: import tcp/eor, tcp/splice, tcp/ts_recent, tcp/blocking (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: import tcp/fast_recovery, tcp/nagle, tcp/timestamping (Hangbin Liu) [RHEL-88651]
- selftests/net: packetdrill: import tcp/ecn, tcp/close, tcp/sack, tcp/tcp_info (Hangbin Liu) [RHEL-88651]
- cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode (Steve Best) [RHEL-81034]
- ipv6: add exception routes to GC list in rt6_insert_exception (Xin Long) [RHEL-39466 RHEL-84411]
- OPP: Drop redundant *_opp_attach|detach_genpd() (José Expósito) [RHEL-75956]
- cpufreq: qcom-nvmem: Convert to dev_pm_domain_attach|detach_list() (José Expósito) [RHEL-75956]
- media: venus: Convert into devm_pm_domain_attach_list() for OPP PM domain (José Expósito) [RHEL-75956]
- drm/tegra: gr3d: Convert into devm_pm_domain_attach_list() (José Expósito) [RHEL-75956]
- OPP: Drop redundant code in _link_required_opps() (José Expósito) [RHEL-75956]
- pmdomain: core: Set the required dev for a required OPP during genpd attach (José Expósito) [RHEL-75956]
- pmdomain: core: Manage the default required OPP from a separate function (José Expósito) [RHEL-75956]
- xfs: don't over-report free space or inodes in statvfs (Carlos Maiolino) [RHEL-87016]
- xfs: report realtime block quota limits on realtime directories (Carlos Maiolino) [RHEL-87016]
- redhat: introduce modules-extra-matched meta package (Jan Stancek) [RHEL-87452]
- ext4: fix OOB read when checking dotdot dir (CKI Backport Bot) [RHEL-87989] {CVE-2025-37785}
- selftests: net: fdb_notify: Add a test for FDB notifications (Izabela Bakollari) [RHEL-78790]
- selftests: net: lib: Add kill_process (Izabela Bakollari) [RHEL-78790]
- selftests: net: lib: Move checks from forwarding/lib.sh here (Izabela Bakollari) [RHEL-78790]
- selftests: net: lib: Move tests_run from forwarding/lib.sh here (Izabela Bakollari) [RHEL-78790]
- selftests: net: lib: Move logging from forwarding/lib.sh here (Izabela Bakollari) [RHEL-78790]
- ndo_fdb_del: Add a parameter to report whether notification was sent (Izabela Bakollari) [RHEL-78790]
- ndo_fdb_add: Add a parameter to report whether notification was sent (Izabela Bakollari) [RHEL-78790]
Resolves: RHEL-39466, RHEL-75956, RHEL-78790, RHEL-81034, RHEL-84411, RHEL-87016, RHEL-87452, RHEL-87989, RHEL-88651
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 = 85
|
|
|
|
#
|
|
# 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
|