2021-08-30 22:48:52 +00:00
|
|
|
RHEL_MAJOR = 9
|
2023-03-07 14:22:21 +00:00
|
|
|
RHEL_MINOR = 3
|
2020-10-15 12:41:02 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# 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.
|
kernel-5.14.0-346.el9
* Wed Jul 26 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-346.el9]
- redhat: configs: Enable CONFIG_TYPEC_STUSB160X for rhel on aarch64 (Desnes Nunes) [2222412]
- usb: typec: stusb160x: Switch to use dev_err_probe() helper (Desnes Nunes) [2222412]
- cpuidle: psci: Iterate backwards over list in psci_pd_remove() (Mark Langsdorf) [2181277]
- cpuidle: driver: Update microsecond values of state parameters as needed (Mark Langsdorf) [2181277]
- cpuidle: sysfs: make kobj_type structures constant (Mark Langsdorf) [2181277]
- cpuidle: add ARCH_SUSPEND_POSSIBLE dependencies (Mark Langsdorf) [2181277]
- cpuidle: tegra: Enable compile testing (Mark Langsdorf) [2181277]
- cpuidle: Fix poll_idle() noinstr annotation (Mark Langsdorf) [2181277]
- cpuidle-haltpoll: Replace default_idle() with arch_cpu_idle() (Mark Langsdorf) [2181277]
- cpuidle, arm64: Fix the ARM64 cpuidle logic (Mark Langsdorf) [2181277]
- cpuidle: mvebu: Fix duplicate flags assignment (Mark Langsdorf) [2181277]
- cpuidle-haltpoll: select haltpoll governor (Mark Langsdorf) [2181277]
- powerpc/pseries: Always inline functions called from cpuidle (Mark Langsdorf) [2181277]
- cpuidle: pseries: Mark ->enter() functions as __cpuidle (Mark Langsdorf) [2181277]
- cpuidle: Add comments about noinstr/__cpuidle usage (Mark Langsdorf) [2181277]
- cpuidle, arch: Mark all ct_cpuidle_enter() callers __cpuidle (Mark Langsdorf) [2181277]
- cpuidle: Ensure ct_cpuidle_enter() is always called from noinstr/__cpuidle (Mark Langsdorf) [2181277]
- objtool/idle: Validate __cpuidle code as noinstr (Mark Langsdorf) [2181277]
- cpuidle: Annotate poll_idle() (Mark Langsdorf) [2181277]
- cpuidle, cpu_pm: Remove RCU fiddling from cpu_pm_{enter,exit}() (Mark Langsdorf) [2181277]
- cpuidle: Fix ct_idle_*() usage (Mark Langsdorf) [2181277]
- cpuidle, ARM/imx6: Push RCU-idle into driver (Mark Langsdorf) [2181277]
- cpuidle, dt: Push RCU-idle into driver (Mark Langsdorf) [2181277]
- cpuidle, armada: Push RCU-idle into driver (Mark Langsdorf) [2181277]
- cpuidle, psci: Push RCU-idle into driver (Mark Langsdorf) [2181277]
- cpuidle, tegra: Push RCU-idle into driver (Mark Langsdorf) [2181277]
- cpuidle: Move IRQ state validation (Mark Langsdorf) [2181277]
- cpuidle/poll: Ensure IRQs stay disabled after cpuidle_state::enter() calls (Mark Langsdorf) [2181277]
- cpuidle: teo: Introduce util-awareness (Mark Langsdorf) [2181277]
- cpuidle: teo: Optionally skip polling states in teo_find_shallower_state() (Mark Langsdorf) [2181277]
- powerpc/cpuidle: Set CPUIDLE_FLAG_POLLING for snooze state (Mark Langsdorf) [2181277]
- cpuidle: dt: Clarify a comment and simplify code in dt_init_idle_driver() (Mark Langsdorf) [2181277]
- cpuidle: dt: Return the correct numbers of parsed idle states (Mark Langsdorf) [2181277]
- cpuidle: psci: Extend information in log about OSI/PC mode (Mark Langsdorf) [2181277]
- firmware/psci: Print a warning if PSCI doesn't accept PC mode (Mark Langsdorf) [2181277]
- cpuidle: Remove redundant check in cpuidle_switch_governor() (Mark Langsdorf) [2181277]
- cpuidle: powernv: move from strlcpy() with unused retval to strscpy() (Mark Langsdorf) [2181277]
- cpuidle: coupled: Drop duplicate word from a comment (Mark Langsdorf) [2181277]
- powerpc/pseries/vas: Hold mmap_mutex after mmap lock during window close (Mamatha Inamdar) [2224430]
- net/sched: flower: fix possible OOB write in fl_set_geneve_opt() (Davide Caratti) [2214029] {CVE-2023-35788}
- libceph: harden msgr2.1 frame segment length checks (Ilya Dryomov) [2222253]
- ice: prevent NULL pointer deref during reload (Petr Oros) [2221923]
- ice: Unregister netdev and devlink_port only once (Petr Oros) [2221923]
- ice: reduce initial wait for control queue messages (Petr Oros) [2221923]
- ice: use ice_down_up() where applicable (Petr Oros) [2221923]
- ice: Fix ice module unload (Petr Oros) [2221923]
- ice: Fix tx queue rate limit when TCs are configured (Petr Oros) [2221923]
- ice: Fix max_rate check while configuring TX rate limits (Petr Oros) [2221923]
- ice: Fix XDP memory leak when NIC is brought up and down (Petr Oros) [2221923]
- ice: always return IRQ_WAKE_THREAD in ice_misc_intr() (Petr Oros) [2221923]
- ice: handle extts in the miscellaneous interrupt thread (Petr Oros) [2221923]
- ice: recycle/free all of the fragments from multi-buffer frame (Petr Oros) [2221923]
- ice: Don't dereference NULL in ice_gnss_read error path (Petr Oros) [2221923]
- ice: Fix stats after PF reset (Petr Oros) [2221923]
- netfilter: nf_tables: prevent OOB access in nft_byteorder_eval (Florian Westphal) [2221047] {CVE-2023-35001}
- ext4: fix i_version handling in ext4 (Carlos Maiolino) [2107587]
- ext4: unconditionally enable the i_version counter (Carlos Maiolino) [2107587]
- ceph: fix use-after-free bug for inodes when flushing capsnaps (Xiubo Li) [2214449]
- ipvlan:Fix out-of-bounds caused by unclear skb->cb (Davide Caratti) [2218677] {CVE-2023-3090}
- netfilter: nf_tables: do not ignore genmask when looking up chain by id (Florian Westphal) [2221049] {CVE-2023-31248}
- KVM: s390: pv: fix index value of replaced ASCE (Thomas Huth) [RHEL-774]
- KVM: s390: pv: simplify shutdown and fix race (Thomas Huth) [RHEL-774]
- s390/vfio-ap: wire in the vfio_device_ops request callback (Thomas Huth) [RHEL-774]
- s390/vfio-ap: realize the VFIO_DEVICE_SET_IRQS ioctl (Thomas Huth) [RHEL-774]
- s390/vfio-ap: realize the VFIO_DEVICE_GET_IRQ_INFO ioctl (Thomas Huth) [RHEL-774]
- KVM: s390/diag: fix racy access of physical cpu number in diag 9c handler (Thomas Huth) [RHEL-774]
- KVM: s390: vsie: fix the length of APCB bitmap (Thomas Huth) [RHEL-774]
- KVM: s390: selftests: add selftest for CMMA migration (Thomas Huth) [RHEL-774]
- KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes (Thomas Huth) [RHEL-774]
- KVM: s390: pv: fix external interruption loop not always detected (Thomas Huth) [RHEL-774]
- KVM: s390: disable migration mode when dirty tracking is disabled (Thomas Huth) [RHEL-774]
Resolves: rhbz#2107587, rhbz#2181277, rhbz#2214029, rhbz#2214449, rhbz#2218677, rhbz#2221047, rhbz#2221049, rhbz#2221923, rhbz#2222253, rhbz#2222412, rhbz#2224430, RHEL-774
Signed-off-by: Jan Stancek <jstancek@redhat.com>
2023-07-26 13:00:41 +00:00
|
|
|
RHEL_RELEASE = 346
|
2022-03-20 08:42:21 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# 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
|
2020-10-15 12:41:02 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# 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
|