forked from rpms/kernel
544bea8ecf
* Mon Mar 24 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-68.el10]
- platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show() (Steve Best) [RHEL-79463]
- platform/x86: intel/pmc: Fix ioremap() of bad address (Steve Best) [RHEL-79463]
- x86/tsc: Move away from TSC leaf magic numbers (Steve Best) [RHEL-79463]
- x86/cpu: Move TSC CPUID leaf definition (Steve Best) [RHEL-79463]
- vrf: use RCU protection in l3mdev_l3_out() (Guillaume Nault) [RHEL-81545] {CVE-2025-21791}
- powerpc/pseries/vas: Add close() callback in vas_vm_ops struct (Mamatha Inamdar) [RHEL-83836]
- async_xor: Remove unused 'async_xor_val' (Nigel Croxon) [RHEL-83951]
- md/raid10: wait barrier before returning discard request with REQ_NOWAIT (Nigel Croxon) [RHEL-83951]
- md/md-bitmap: fix wrong bitmap_limit for clustermd when write sb (Nigel Croxon) [RHEL-83951]
- md/raid1,raid10: don't ignore IO flags (Nigel Croxon) [RHEL-83951]
- md/raid5: merge reshape_progress checking inside get_reshape_loc() (Nigel Croxon) [RHEL-83951]
- md: fix mddev uaf while iterating all_mddevs list (Nigel Croxon) [RHEL-83951]
- md: switch md-cluster to use md_submodle_head (Nigel Croxon) [RHEL-83951]
- md: switch personalities to use md_submodule_head (Nigel Croxon) [RHEL-83951]
- md: don't export md_cluster_ops (Nigel Croxon) [RHEL-83951]
- md/md-cluster: cleanup md_cluster_ops reference (Nigel Croxon) [RHEL-83951]
- md: introduce struct md_submodule_head and APIs (Nigel Croxon) [RHEL-83951]
- md: only include md-cluster.h if necessary (Nigel Croxon) [RHEL-83951]
- md: merge common code into find_pers() (Nigel Croxon) [RHEL-83951]
- md/raid1: fix memory leak in raid1_run() if no active rdev (Nigel Croxon) [RHEL-83951]
- md: ensure resync is prioritized over recovery (Nigel Croxon) [RHEL-83951]
- tpm: Change to kvalloc() in eventlog/acpi.c (CKI Backport Bot) [RHEL-81492] {CVE-2024-58005}
- dpll: add clock quality level attribute and op (Petr Oros) [RHEL-77874]
- i2c: i801: Add support for Intel Panther Lake (Steve Best) [RHEL-47425]
Resolves: RHEL-47425, RHEL-77874, RHEL-79463, RHEL-81492, RHEL-81545, RHEL-83836, RHEL-83951
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 = 68
|
|
|
|
#
|
|
# 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
|