kernel/Makefile.rhelver

81 lines
2.6 KiB
Makefile
Raw Normal View History

kernel-6.8.0-1.el10 * Thu Mar 21 2024 Jan Stancek <jstancek@redhat.com> [6.8.0-1.el10] - redhat: remove fedora configs and files (Jan Stancek) - redhat: init RHEL10.0 beta variables and dist tag (Jan Stancek) - v6.8-rt8 (Sebastian Andrzej Siewior) - net: Provide SMP threads for backlog NAPI. (Sebastian Andrzej Siewior) - perf: Split __perf_pending_irq() out of perf_pending_irq() (Sebastian Andrzej Siewior) - perf: Remove perf_swevent_get_recursion_context() from perf_pending_task(). (Sebastian Andrzej Siewior) - perf: Enqueue SIGTRAP always via task_work. (Sebastian Andrzej Siewior) - perf: Move irq_work_queue() where the event is prepared. (Sebastian Andrzej Siewior) - v6.8-rt7 (Sebastian Andrzej Siewior) - Remove rt pending configs (Don Zickus) - redhat: enable changes to build rt variants (Clark Williams) - gitlab-ci: enable all variants for rawhide/eln builder image gating (Michael Hofmann) - Fedora: enable Microchip and their useful drivers (Peter Robinson) - spec: suppress "set +x" output (Jan Stancek) - redhat/configs: Disable CONFIG_RDMA_SIW (Kamal Heib) - redhat/configs: Disable CONFIG_RDMA_RXE (Kamal Heib) - redhat/configs: Disable CONFIG_MLX4 (Kamal Heib) - redhat/configs: Disable CONFIG_INFINIBAND_HFI1 and CONFIG_INFINIBAND_RDMAVT (Kamal Heib) - Consolidate 6.8 configs to common (Justin M. Forbes) - v6.8-rc7-rt6 (Sebastian Andrzej Siewior) - serial: Use uart_prepare_sysrq_char(). (Sebastian Andrzej Siewior) - v6.8-rc7-rt5 (Sebastian Andrzej Siewior) - Remove rt-automated and master-rt-devel logic (Don Zickus) - Add support for CI octopus merging (Don Zickus) - redhat/configs: Disable CONFIG_INFINIBAND_VMWARE_PVRDMA (Kamal Heib) - gitlab-ci: fix merge tree URL for gating pipelines (Michael Hofmann) - Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) - uki: use systemd-pcrphase dracut module (Gerd Hoffmann) - Add libperf-debuginfo subpackage (Justin M. Forbes) - redhat/kernel.spec.template: Add log_msg macro (Prarit Bhargava) - v6.8-rc4-rt4 (Sebastian Andrzej Siewior) - printk: Update the printk series. (Sebastian Andrzej Siewior) - i915: Correct macro definition for !i915 builds. (Sebastian Andrzej Siewior) - v6.8-rc4-rt3 (Sebastian Andrzej Siewior) - v6.8-rc1-rt2 (Sebastian Andrzej Siewior) - arm: Disable FAST_GUP on PREEMPT_RT if HIGHPTE is also enabled. (Sebastian Andrzej Siewior) - printk: nbcon: move locked_port flag to struct uart_port (Junxiao Chang) - Add localversion for -RT release (Thomas Gleixner) - sysfs: Add /sys/kernel/realtime entry (Clark Williams) - riscv: allow to enable RT (Jisheng Zhang) - riscv: add PREEMPT_AUTO support (Jisheng Zhang) - POWERPC: Allow to enable RT (Sebastian Andrzej Siewior) - powerpc/stackprotector: work around stack-guard init from atomic (Sebastian Andrzej Siewior) - powerpc/kvm: Disable in-kernel MPIC emulation for PREEMPT_RT (Bogdan Purcareata) - powerpc/pseries: Select the generic memory allocator. (Sebastian Andrzej Siewior) - powerpc/pseries/iommu: Use a locallock instead local_irq_save() (Sebastian Andrzej Siewior) - powerpc: traps: Use PREEMPT_RT (Sebastian Andrzej Siewior) - ARM64: Allow to enable RT (Sebastian Andrzej Siewior) - ARM: Allow to enable RT (Sebastian Andrzej Siewior) - ARM: vfp: Move sending signals outside of vfp_lock()ed section. (Sebastian Andrzej Siewior) - ARM: vfp: Use vfp_lock() in vfp_support_entry(). (Sebastian Andrzej Siewior) - ARM: vfp: Use vfp_lock() in vfp_sync_hwstate(). (Sebastian Andrzej Siewior) - ARM: vfp: Provide vfp_lock() for VFP locking. (Sebastian Andrzej Siewior) - tty/serial/pl011: Make the locking work on RT (Thomas Gleixner) - tty/serial/omap: Make the locking RT aware (Thomas Gleixner) - ARM: enable irq in translation/section permission fault handlers (Yadi.hu) - arm: Disable jump-label on PREEMPT_RT. (Thomas Gleixner) - sched: define TIF_ALLOW_RESCHED (Thomas Gleixner) - Revert "drm/i915: Depend on !PREEMPT_RT." (Sebastian Andrzej Siewior) - drm/i915/guc: Consider also RCU depth in busy loop. (Sebastian Andrzej Siewior) - drm/i915: Drop the irqs_disabled() check (Sebastian Andrzej Siewior) - drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() (Sebastian Andrzej Siewior) - drm/i915/gt: Queue and wait for the irq_work item. (Sebastian Andrzej Siewior) - drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with NOTRACE (Sebastian Andrzej Siewior) - drm/i915: Disable tracing points on PREEMPT_RT (Sebastian Andrzej Siewior) - drm/i915: Don't check for atomic context on PREEMPT_RT (Sebastian Andrzej Siewior) - drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates (Mike Galbraith) - drm/i915: Use preempt_disable/enable_rt() where recommended (Mike Galbraith) - printk: Avoid false positive lockdep report for legacy driver. (John Ogness) - serial: 8250: revert "drop lockdep annotation from serial8250_clear_IER()" (John Ogness) - printk: Add kthread for all legacy consoles (John Ogness) - serial: 8250: Switch to nbcon console (John Ogness) - serial: core: Provide low-level functions to port lock (John Ogness) - printk: nbcon: Provide function to reacquire ownership (John Ogness) - tty: sysfs: Add nbcon support for 'active' (John Ogness) - proc: Add nbcon support for /proc/consoles (John Ogness) - printk: nbcon: Start printing threads (John Ogness) - printk: nbcon: Stop threads on shutdown/reboot (John Ogness) - printk: nbcon: Add printer thread wakeups (Thomas Gleixner) - printk: nbcon: Add context to console_is_usable() (John Ogness) - printk: Atomic print in printk context on shutdown (John Ogness) - printk: nbcon: Introduce printing kthreads (Thomas Gleixner) - lockdep: Mark emergency section in lockdep splats (John Ogness) - rcu: Mark emergency section in rcu stalls (John Ogness) - panic: Mark emergency section in oops (John Ogness) - panic: Mark emergency section in warn (Thomas Gleixner) - printk: nbcon: Implement emergency sections (Thomas Gleixner) - printk: Coordinate direct printing in panic (John Ogness) - printk: Track nbcon consoles (John Ogness) - printk: Avoid console_lock dance if no legacy or boot consoles (John Ogness) - printk: nbcon: Add unsafe flushing on panic (John Ogness) - printk: nbcon: Assign priority based on CPU state (John Ogness) - printk: nbcon: Use nbcon consoles in console_flush_all() (John Ogness) - printk: Track registered boot consoles (John Ogness) - printk: nbcon: Provide function to flush using write_atomic() (Thomas Gleixner) - printk: Add @flags argument for console_is_usable() (John Ogness) - printk: Let console_is_usable() handle nbcon (John Ogness) - printk: Make console_is_usable() available to nbcon (John Ogness) - printk: nbcon: Add driver_enter/driver_exit console callbacks (John Ogness) - printk: nbcon: Implement processing in port->lock wrapper (John Ogness) - printk: Check printk_deferred_enter()/_exit() usage (Sebastian Andrzej Siewior) - printk: nbcon: Ensure ownership release on failed emit (John Ogness) - printk: Add sparse notation to console_srcu locking (John Ogness) - printk: Consider nbcon boot consoles on seq init (John Ogness) - panic: Flush kernel log buffer at the end (John Ogness) - printk: Avoid non-panic CPUs writing to ringbuffer (John Ogness) - printk: Disable passing console lock owner completely during panic() (Petr Mladek) - printk: ringbuffer: Consider committed as finalized in panic (John Ogness) - printk: ringbuffer: Skip non-finalized records in panic (John Ogness) - printk: Wait for all reserved records with pr_flush() (John Ogness) - printk: ringbuffer: Cleanup reader terminology (John Ogness) - printk: Add this_cpu_in_panic() (John Ogness) - printk: For @suppress_panic_printk check for other CPU in panic (John Ogness) - printk: ringbuffer: Clarify special lpos values (John Ogness) - printk: ringbuffer: Do not skip non-finalized records with prb_next_seq() (John Ogness) - printk: Use prb_first_seq() as base for 32bit seq macros (John Ogness) - printk: Adjust mapping for 32bit seq macros (Sebastian Andrzej Siewior) - printk: nbcon: Relocate 32bit seq macros (John Ogness) - time: Allow to preempt after a callback. (Sebastian Andrzej Siewior) - softirq: Add function to preempt serving softirqs. (Sebastian Andrzej Siewior) - sched/core: Provide a method to check if a task is PI-boosted. (Sebastian Andrzej Siewior) - zram: Replace bit spinlocks with spinlock_t for PREEMPT_RT. (Mike Galbraith) - softirq: Wake ktimers thread also in softirq. (Junxiao Chang) - tick: Fix timer storm since introduction of timersd (Frederic Weisbecker) - rcutorture: Also force sched priority to timersd on boosting test. (Frederic Weisbecker) - softirq: Use a dedicated thread for timer wakeups. (Sebastian Andrzej Siewior) - sched/rt: Don't try push tasks if there are none. (Sebastian Andrzej Siewior) - x86: Enable RT also on 32bit (Sebastian Andrzej Siewior) - x86: Allow to enable RT (Sebastian Andrzej Siewior) - net: Avoid the IPI to free the (Sebastian Andrzej Siewior) Resolves: RHEL-29722 Signed-off-by: Jan Stancek <jstancek@redhat.com>
2024-03-24 19:18:25 +00:00
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.
kernel-6.11.0-25.el10 * Mon Sep 16 2024 Jan Stancek <jstancek@redhat.com> [6.11.0-25.el10] - Linux 6.11 (Linus Torvalds) - Revert "KVM: VMX: Always honor guest PAT on CPUs that support self-snoop" (Paolo Bonzini) - pinctrl: pinctrl-cy8c95x0: Fix regcache (Patrick Rudolph) - pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID (Mika Westerberg) - ASoC: meson: axg-card: fix 'use-after-free' (Arseniy Krasnov) - ASoC: codecs: avoid possible garbage value in peb2466_reg_read() (Su Hui) - MAINTAINERS: update Pierre Bossart's email and role (Pierre-Louis Bossart) - ASoC: tas2781: fix to save the dsp bin file name into the correct array in case name_prefix is not NULL (Shenghao Ding) - ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item (Bard Liao) - ASoC: Intel: soc-acpi-intel-lnl-match: add missing empty item (Bard Liao) - cifs: Fix signature miscalculation (David Howells) - PCI: Fix potential deadlock in pcim_intx() (Philipp Stanner) - spi: nxp-fspi: fix the KASAN report out-of-bounds bug (Han Xu) - spi: geni-qcom: Fix incorrect free_irq() sequence (Jinjie Ruan) - spi: geni-qcom: Undo runtime PM changes at driver exit time (Jinjie Ruan) - soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps" (Krzysztof Kozlowski) - drm/xe/client: add missing bo locking in show_meminfo() (Matthew Auld) - drm/xe/client: fix deadlock in show_meminfo() (Matthew Auld) - drm/xe/oa: Enable Xe2+ PES disaggregation (Ashutosh Dixit) - drm/xe/display: fix compat IS_DISPLAY_STEP() range end (Jani Nikula) - drm/xe: Fix access_ok check in user_fence_create (Nirmoy Das) - drm/xe: Fix possible UAF in guc_exec_queue_process_msg (Matthew Brost) - drm/xe: Remove fence check from send_tlb_invalidation (Matthew Brost) - drm/xe/gt: Remove double include (Lucas De Marchi) - drm/tegra: Use iommu_paging_domain_alloc() (Lu Baolu) - drm/rockchip: Use iommu_paging_domain_alloc() (Lu Baolu) - drm/syncobj: Fix syncobj leak in drm_syncobj_eventfd_ioctl (T.J. Mercier) - drm/stm: add COMMON_CLK dependency (Arnd Bergmann) - drm/nouveau/fb: restore init() for ramgp102 (Ben Skeggs) - dma-buf: heaps: Fix off-by-one in CMA heap fault handler (T.J. Mercier) - drm/i915/guc: prevent a possible int overflow in wq offsets (Nikita Zhandarovich) - drm/amd/display: Add all planes on CRTC to state for overlay cursor (Leo Li) - drm/amdgpu/atomfirmware: Silence UBSAN warning (Alex Deucher) - drm/amd/amdgpu: apply command submission parser for JPEG v1 (David (Ming Qiang) Wu) - drm/amd/amdgpu: apply command submission parser for JPEG v2+ (David (Ming Qiang) Wu) - drm/amd/pm: fix the pp_dpm_pcie issue on smu v14.0.2/3 (Kenneth Feng) - drm/amd/pm: update the features set on smu v14.0.2/3 (Kenneth Feng) - drm/amd/display: Do not reset planes based on crtc zpos_changed (Leo Li) - drm/amd/display: Avoid race between dcn35_set_drr() and dc_state_destruct() (Tobias Jakobi) - drm/amd/display: Avoid race between dcn10_set_drr() and dc_state_destruct() (Tobias Jakobi) - drm/amdkfd: Add cache line size info (David Belanger) - Consolidate configs into common for 6.11 kernels (Justin M. Forbes) - uki-virt: add systemd-cryptsetup module (Vitaly Kuznetsov) - redhat/docs: fix command to install missing build dependencies (Davide Cavalca) - clk: qcom: clk-alpha-pll: Simplify the zonda_pll_adjust_l_val() (Satya Priya Kakitapalli) - block: Prevent deadlocks when switching elevators (Damien Le Moal) - hwmon: (pmbus) Conditionally clear individual status bits for pmbus rev >= 1.2 (Patryk Biel) - workqueue: Clear worker->pool in the worker thread context (Lai Jiangshan) - riscv: Disable preemption while handling PR_RISCV_CTX_SW_FENCEI_OFF (Charlie Jenkins) - drivers: perf: Fix smp_processor_id() use in preemptible code (Alexandre Ghiti) - net: netfilter: move nf flowtable bpf initialization in nf_flow_table_module_init() (Lorenzo Bianconi) - netfilter: nft_socket: make cgroupsv2 matching work with namespaces (Florian Westphal) - netfilter: nft_socket: fix sk refcount leaks (Florian Westphal) - net: tighten bad gso csum offset check in virtio_net_hdr (Willem de Bruijn) - netlink: specs: mptcp: fix port endianness (Asbjørn Sloth Tønnesen) - net: dpaa: Pad packets to ETH_ZLEN (Sean Anderson) - mptcp: pm: Fix uaf in __timer_delete_sync (Edward Adam Davis) - net: libwx: fix number of Rx and Tx descriptors (Jiawen Wu) - net: dsa: felix: ignore pending status of TAS module when it's disabled (Xiaoliang Yang) - net: hsr: prevent NULL pointer dereference in hsr_proxy_announce() (Jeongjun Park) - selftests: mptcp: include net_helper.sh file (Matthieu Baerts (NGI0)) - selftests: mptcp: include lib.sh file (Matthieu Baerts (NGI0)) - selftests: mptcp: join: restrict fullmesh endp on 1st sf (Matthieu Baerts (NGI0)) - igb: Always call igb_xdp_ring_update_tail() under Tx lock (Sriram Yagnaraman) - ice: fix VSI lists confusion when adding VLANs (Michal Schmidt) - ice: stop calling pci_disable_device() as we use pcim (Przemek Kitszel) - ice: fix accounting for filters shared by multiple VSIs (Jacob Keller) - ice: Fix lldp packets dropping after changing the number of channels (Martyna Szapar-Mudlaw) - net/mlx5: Fix bridge mode operations when there are no VFs (Benjamin Poirier) - net/mlx5: Verify support for scheduling element and TSAR type (Carolina Jubran) - net/mlx5: Add missing masks and QoS bit masks for scheduling elements (Carolina Jubran) - net/mlx5: Explicitly set scheduling element and TSAR type (Carolina Jubran) - net/mlx5e: Add missing link mode to ptys2ext_ethtool_map (Shahar Shitrit) - net/mlx5e: Add missing link modes to ptys2ethtool_map (Shahar Shitrit) - net/mlx5: Update the list of the PCI supported devices (Maher Sanalla) - MAINTAINERS: Add ethtool pse-pd to PSE NETWORK DRIVER (Kory Maincent) - dt-bindings: net: tja11xx: fix the broken binding (Wei Fang) - selftests: net: csum: Fix checksums for packets with non-zero padding (Sean Anderson) - net: phy: dp83822: Fix NULL pointer dereference on DP83825 devices (Tomas Paukrt) - virtio_net: disable premapped mode by default (Xuan Zhuo) - Revert "virtio_net: big mode skip the unmap check" (Xuan Zhuo) - Revert "virtio_net: rx remove premapped failover code" (Xuan Zhuo) - net: ftgmac100: Enable TX interrupt to avoid TX timeout (Jacky Chou) - octeontx2-af: Modify SMQ flush sequence to drop packets (Naveen Mamindlapalli) - fou: fix initialization of grc (Muhammad Usama Anjum) - net: hsr: remove seqnr_lock (Eric Dumazet) - platform/x86: asus-wmi: Disable OOBE experience on Zenbook S 16 (Bas Nieuwenhuizen) - platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array (Hans de Goede) - platform/x86: panasonic-laptop: Fix SINF array out of bounds accesses (Hans de Goede) - mm: avoid leaving partial pfn mappings around in error case (Linus Torvalds) - spec: Respect rpmbuild --without debuginfo (Orgad Shaneh) - fedora/configs: enable GPIO expander drivers (Rupinderjit Singh) - redhat/configs: Switch to the Rust implementation of AX88796B_PHY driver for Fedora (Neal Gompa) - redhat: Turn on support for Rust code in Fedora (Neal Gompa) - Turn off RUST for risc-v (Justin M. Forbes) - riscv: dts: starfive: jh7110-common: Fix lower rate of CPUfreq by setting PLL0 rate to 1.5GHz (Xingyu Wu) - platform: cznic: turris-omnia-mcu: fix HW_RANDOM dependency (Arnd Bergmann) - arm64: dts: rockchip: Fix compatibles for RK3588 VO{0,1}_GRF (Cristian Ciocaltea) - dt-bindings: soc: rockchip: Fix compatibles for RK3588 VO{0,1}_GRF (Cristian Ciocaltea) - arm64: dts: rockchip: override BIOS_DISABLE signal via GPIO hog on RK3399 Puma (Quentin Schulz) - arm64: dts: rockchip: fix eMMC/SPI corruption when audio has been used on RK3399 Puma (Quentin Schulz) - arm64: dts: rockchip: fix PMIC interrupt pin in pinctrl for ROCK Pi E (FUKAUMI Naoki) - arm64: dts: rockchip: Remove broken tsadc pinctrl binding for rk356x (Alexander Shiyan) - firmware: qcom: uefisecapp: Fix deadlock in qcuefi_acquire() (Dan Carpenter) - dm-integrity: fix a race condition when accessing recalc_sector (Mikulas Patocka) - printk: Export match_devname_and_update_preferred_console() (Yu Liao) - minmax: reduce min/max macro expansion in atomisp driver (Lorenzo Stoakes) - gitlab-ci: allow failure of clang LTO pipelines (Michael Hofmann) - redhat/configs: Consolidate the CONFIG_KVM_BOOK3S_HV_P*_TIMING switches (Thomas Huth) - redhat/configs: Consolidate the CONFIG_KVM_SW_PROTECTED_VM switch (Thomas Huth) - redhat/configs: Consolidate the CONFIG_KVM_HYPERV switch (Thomas Huth) - redhat/configs: Consolidate the CONFIG_KVM_AMD_SEV switch (Thomas Huth) - tracing: Drop unused helper function to fix the build (Andy Shevchenko) - tracing/osnoise: Fix build when timerlat is not enabled (Steven Rostedt) - Cleanup some riscv CONFIG locations (Justin M. Forbes) - Fix up pending riscv Fedora configs post merge (Justin M. Forbes) - bcachefs: Don't delete open files in online fsck (Kent Overstreet) - bcachefs: fix btree_key_cache sysfs knob (Kent Overstreet) - bcachefs: More BCH_SB_MEMBER_INVALID support (Kent Overstreet) - bcachefs: Simplify bch2_bkey_drop_ptrs() (Kent Overstreet) - bcachefs: Add a cond_resched() to __journal_keys_sort() (Kent Overstreet) - bcachefs: Fix ca->io_ref usage (Kent Overstreet) - hv: vmbus: Constify struct kobj_type and struct attribute_group (Hongbo Li) - tools: hv: rm .*.cmd when make clean (zhang jiao) - x86/hyperv: fix kexec crash due to VP assist page corruption (Anirudh Rayabharam (Microsoft)) - Drivers: hv: vmbus: Fix the misplaced function description (Roman Kisel) - tools: hv: lsvmbus: change shebang to use python3 (Anthony Nandaa) - x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides frequency (Michael Kelley) - Documentation: hyperv: Add overview of Confidential Computing VM support (Michael Kelley) - clocksource: hyper-v: Use lapic timer in a TDX VM without paravisor (Dexuan Cui) - Drivers: hv: Remove deprecated hv_fcopy declarations (Rachel Menge) - fedora/configs: Enable SCMI configuration (Rupinderjit Singh) - Remove S390 special config for PHYLIB (Justin M. Forbes) - Disable ELN for riscv64 (Isaiah Stapleton) - redhat: add checks to ensure only building riscv64 on fedora (Isaiah Stapleton) - redhat: Add missing riscv fedora configs (Isaiah Stapleton) - Add riscv64 to the CI pipelines (Isaiah Stapleton) - redhat: Regenerate dist-self-test-data for riscv64 (Isaiah Stapleton) - redhat: Add riscv config changes for fedora (David Abdurachmanov) - redhat: Add support for riscv (David Abdurachmanov) - Linux v6.11.0 Resolves: RHEL-56700 Signed-off-by: Jan Stancek <jstancek@redhat.com>
2024-09-16 14:22:29 +00:00
RHEL_RELEASE = 25
#
# 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