d5145555d3
* Wed Jan 15 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-42.el10]
- net: sched: fix erspan_opt settings in cls_flower (Xin Long) [RHEL-73195]
- KVM: SVM: Allow guest writes to set MSR_AMD64_DE_CFG bits (Vitaly Kuznetsov) [RHEL-71416]
- redhat/configs: enable ARCH_TEGRA_241_SOC (Mark Salter) [RHEL-67684]
- x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation (Steve Best) [RHEL-68393]
- net: sysctl: allow dump_cpumask to handle higher numbers of CPUs (Antoine Tenart) [RHEL-73199]
- net: sysctl: do not reserve an extra char in dump_cpumask temporary buffer (Antoine Tenart) [RHEL-73199]
- net: sysctl: remove always-true condition (Antoine Tenart) [RHEL-73199]
- net: tcp: Add noinline_for_tracing annotation for tcp_drop_reason() (Antoine Tenart) [RHEL-73172]
- compiler_types: Add noinline_for_tracing annotation (Antoine Tenart) [RHEL-73172]
- net: vxlan: replace VXLAN_INVALID_HDR with VNI_NOT_FOUND (Antoine Tenart) [RHEL-73172]
- net: vxlan: use kfree_skb_reason() in encap_bypass_if_local() (Antoine Tenart) [RHEL-73172]
- net: vxlan: use kfree_skb_reason() in vxlan_encap_bypass() (Antoine Tenart) [RHEL-73172]
- net: vxlan: use kfree_skb_reason() in vxlan_mdb_xmit() (Antoine Tenart) [RHEL-73172]
- net: vxlan: add drop reasons support to vxlan_xmit_one() (Antoine Tenart) [RHEL-73172]
- net: vxlan: use kfree_skb_reason() in vxlan_xmit() (Antoine Tenart) [RHEL-73172]
- net: vxlan: make vxlan_set_mac() return drop reasons (Antoine Tenart) [RHEL-73172]
- net: vxlan: make vxlan_snoop() return drop reasons (Antoine Tenart) [RHEL-73172]
- net: vxlan: make vxlan_remcsum() return drop reasons (Antoine Tenart) [RHEL-73172]
- net: vxlan: add skb drop reasons to vxlan_rcv() (Antoine Tenart) [RHEL-73172]
- net: tunnel: make skb_vlan_inet_prepare() return drop reasons (Antoine Tenart) [RHEL-73172]
- net: tunnel: add pskb_inet_may_pull_reason() helper (Antoine Tenart) [RHEL-73172]
- net: skb: add pskb_network_may_pull_reason() helper (Antoine Tenart) [RHEL-73172]
- redhat: Install bpftool into BPF selftests dir (Viktor Malik) [RHEL-73480]
- redhat: Drop bpftool from kernel spec (Viktor Malik) [RHEL-73480]
- tools/power turbostat: Add initial support for GraniteRapids-D (Eddie Kovsky) [RHEL-29354]
- rtc: check if __rtc_read_time was successful in rtc_timer_do_work() (Steve Best) [RHEL-73490] {CVE-2024-56739}
- powerpc/mm/fault: Fix kfence page fault reporting (Mamatha Inamdar) [RHEL-73630]
- bonding: Fix feature propagation of NETIF_F_GSO_ENCAP_ALL (CKI Backport Bot) [RHEL-73198]
- bonding: Fix initial {vlan,mpls}_feature set in bond_compute_features (CKI Backport Bot) [RHEL-73198]
- net, team, bonding: Add netdev_base_features helper (CKI Backport Bot) [RHEL-73198]
- bonding: add ESP offload features when slaves support (CKI Backport Bot) [RHEL-73198]
- Documentation: bonding: add XDP support explanation (CKI Backport Bot) [RHEL-73198]
- bonding: return detailed error when loading native XDP fails (CKI Backport Bot) [RHEL-73198]
Resolves: RHEL-29354, RHEL-67684, RHEL-68393, RHEL-71416, RHEL-73172, RHEL-73195, RHEL-73198, RHEL-73199, RHEL-73480, RHEL-73490, RHEL-73630
Signed-off-by: Jan Stancek <jstancek@redhat.com>
81 lines
2.6 KiB
Makefile
81 lines
2.6 KiB
Makefile
RHEL_MAJOR = 10
|
|
RHEL_MINOR = 0
|
|
|
|
#
|
|
# 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 = 42
|
|
|
|
#
|
|
# 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
|