8a7c5e35ff
* Wed Jul 16 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-110.el10]
- nvme-multipath: fix suspicious RCU usage warning (Chris Leech) [RHEL-102650]
- livepatch: no need to build kselftests with kernel (Radomir Vrbovsky) [RHEL-70905]
- treewide: Switch/rename to timer_delete[_sync]() (Dennis Chen) [RHEL-72659]
- sfc: fix NULL dereferences in ef100_process_design_param() (Dennis Chen) [RHEL-72659]
- sfc: support X4 devlink flash (Dennis Chen) [RHEL-72659]
- sfc: update MCDI protocol headers (Dennis Chen) [RHEL-72659]
- sfc: rip out MDIO support (Dennis Chen) [RHEL-72659]
- sfc: Remove newline at the end of a netlink error message (Dennis Chen) [RHEL-72659]
- sfc: document devlink flash support (Dennis Chen) [RHEL-72659]
- sfc: deploy devlink flash images to NIC over MCDI (Dennis Chen) [RHEL-72659]
- sfc: extend NVRAM MCDI handlers (Dennis Chen) [RHEL-72659]
- sfc: parse headers of devlink flash images (Dennis Chen) [RHEL-72659]
- net: sfc: Correct key_len for efx_tc_ct_zone_ht_params (Dennis Chen) [RHEL-72659]
- sfc: Use netdev refcount tracking in struct efx_async_filter_insertion (Dennis Chen) [RHEL-72659]
- sfc: remove efx_writed_page_locked (Dennis Chen) [RHEL-72659]
- net: sfc: use ethtool string helpers (Dennis Chen) [RHEL-72659]
- sfc: Remove more unused functions (Dennis Chen) [RHEL-72659]
- sfc: Remove unused mcdi functions (Dennis Chen) [RHEL-72659]
- sfc: Remove unused efx_mae_mport_vf (Dennis Chen) [RHEL-72659]
- sfc: Remove falcon deadcode (Dennis Chen) [RHEL-72659]
- sfc: add per-queue RX bytes stats (Dennis Chen) [RHEL-72659]
- sfc: implement per-queue TSO (hw_gso) stats (Dennis Chen) [RHEL-72659]
- sfc: implement per-queue rx drop and overrun stats (Dennis Chen) [RHEL-72659]
- sfc: account XDP TXes in netdev base stats (Dennis Chen) [RHEL-72659]
- sfc: add n_rx_overlength to ethtool stats (Dennis Chen) [RHEL-72659]
- sfc: implement basic per-queue stats (Dennis Chen) [RHEL-72659]
- sfc: remove obsolete counters from struct efx_channel (Dennis Chen) [RHEL-72659]
- mm/hugetlb: fix huge_pmd_unshare() vs GUP-fast race (Rafael Aquini) [RHEL-101261] {CVE-2025-38085}
- mm/hugetlb: unshare page tables during VMA split, not before (Rafael Aquini) [RHEL-101296] {CVE-2025-38084}
- tools/testing/vma: add missing function stub (Rafael Aquini) [RHEL-101296]
- mm: fix copy_vma() error handling for hugetlb mappings (Rafael Aquini) [RHEL-101296]
- crypto: algif_hash - fix double free in hash_accept (CKI Backport Bot) [RHEL-102248] {CVE-2025-38079}
- ntb_hw_amd: Add NTB PCI ID for new gen CPU (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ptdma: Move variable condition check to the first place and remove redundancy (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ptdma: Utilize the AE4DMA engine's multi-queue functionality (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ae4dma: Use the MSI count and its corresponding IRQ number (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ae4dma: Remove deprecated PCI IDs (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ae4dma: Register debugfs using ptdma_debugfs_setup (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ptdma: Extend ptdma-debugfs to support multi-queue (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ae4dma: Register AE4DMA using pt_dmaengine_register (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ptdma: Extend ptdma to support multi-channel and version (Jerry Snitselaar) [RHEL-94523]
- redhat/configs: Enable CONFIG_AMD_AE4DMA (Jerry Snitselaar) [RHEL-94523]
- dmaengine: ae4dma: Add AMD ae4dma controller driver (Jerry Snitselaar) [RHEL-94523]
- Merge DRM changes from upstream v6.14..v6.15 (José Expósito) [RHEL-88418]
- redhat/configs: Add new configs from drm 6.15 backport (José Expósito) [RHEL-88418]
Resolves: RHEL-101261, RHEL-101296, RHEL-102248, RHEL-102650, RHEL-70905, RHEL-72659, RHEL-88418, RHEL-94523
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 = 110
|
|
|
|
#
|
|
# 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
|