kernel/Makefile.rhelver

68 lines
2.3 KiB
Makefile
Raw Normal View History

RHEL_MAJOR = 9
kernel-5.14.0-504.el9 * Mon Sep 02 2024 Rado Vrbovsky <rvrbovsk@redhat.com> [5.14.0-504.el9] - Bump RHEL MINOR to 9.6 (Rado Vrbovsky) - block: initialize integrity buffer to zero before writing it to media (Ming Lei) [RHEL-54768] {CVE-2024-43854} - perf/x86/amd/uncore: Fix DF and UMC domain identification (David Arcari) [RHEL-43147] - x86/mm/numa: Move early mptable evaluation into common code (David Arcari) [RHEL-43147] - x86/cpu: Move leftover contents of topology.c to setup.c (David Arcari) [RHEL-43147] - x86/topology: convert to use arch_cpu_is_hotpluggable() (David Arcari) [RHEL-43147] - x86/topology: use weak version of arch_unregister_cpu() (David Arcari) [RHEL-43147] - x86/topology: Switch over to GENERIC_CPU_DEVICES (David Arcari) [RHEL-43147] - x86/topology: remove arch_*register_cpu() exports (David Arcari) [RHEL-43147] - x86/topology/intel: Unlock CPUID before evaluating anything (David Arcari) [RHEL-43147] - x86/topology/amd: Evaluate SMT in CPUID leaf 0x8000001e only on family 0x17 and greater (David Arcari) [RHEL-43147] - x86/topology: Handle bogus ACPI tables correctly (David Arcari) [RHEL-43147] - x86/topology/amd: Ensure that LLC ID is initialized (David Arcari) [RHEL-43147] - x86/xen: return a sane initial apic id when running as PV guest (David Arcari) [RHEL-43147] - x86/cpu/amd: Move TOPOEXT enablement into the topology parser (David Arcari) [RHEL-43147] - x86/cpu/amd: Make the NODEID_MSR union actually work (David Arcari) [RHEL-43147] - x86/cpu/amd: Make the CPUID 0x80000008 parser correct (David Arcari) [RHEL-43147] - x86/topology: Don't update cpu_possible_map in topo_set_cpuids() (David Arcari) [RHEL-43147] - x86/topology: Handle the !APIC case gracefully (David Arcari) [RHEL-43147] - x86/topology: Don't evaluate logical IDs during early boot (David Arcari) [RHEL-43147] - x86/cpu/topology: Add support for the AMD 0x80000026 leaf (David Arcari) [RHEL-43147] - x86/topology: Ignore non-present APIC IDs in a present package (David Arcari) [RHEL-43147] - x86/apic: Build the x86 topology enumeration functions on UP APIC builds too (David Arcari) [RHEL-43147] - x86/cpu/topology: Get rid of cpuinfo::x86_max_cores (David Arcari) [RHEL-43147] - docs: move x86 documentation into Documentation/arch/ [partial] (David Arcari) [RHEL-43147] - x86/cpu: Remove x86_coreid_bits (David Arcari) [RHEL-43147] - x86/mm/numa: Use core domain size on AMD (David Arcari) [RHEL-43147] - x86/cpu/topology: Provide __num_[cores|threads]_per_package (David Arcari) [RHEL-43147] - x86/cpu/topology: Rename smp_num_siblings (David Arcari) [RHEL-43147] - arch/x86/kernel/setup.c: fixup rh_check_supported (David Arcari) [RHEL-43147] - x86/cpu/topology: Retrieve cores per package from topology bitmaps (David Arcari) [RHEL-43147] - x86/cpu/topology: Use topology logical mapping mechanism (David Arcari) [RHEL-43147] - x86/smpboot: Change smp_store_boot_cpu_info() to static (David Arcari) [RHEL-43147] - x86/cpu/topology: Provide logical pkg/die mapping (David Arcari) [RHEL-43147] - x86/cpu/topology: Simplify cpu_mark_primary_thread() (David Arcari) [RHEL-43147] - x86/cpu/topology: Mop up primary thread mask handling (David Arcari) [RHEL-43147] - x86/cpu/topology: Use topology bitmaps for sizing (David Arcari) [RHEL-43147] - x86/xen/smp_pv: Register the boot CPU APIC properly (David Arcari) [RHEL-43147] - x86/cpu/topology: Let XEN/PV use topology from CPUID/MADT (David Arcari) [RHEL-43147] - x86/acpi: Dont invoke topology_register_apic() for XEN PV (David Arcari) [RHEL-43147] - x86/xen/smp_pv: Count number of vCPUs early (David Arcari) [RHEL-43147] - x86/xen/smp_pv: Register fake APICs (David Arcari) [RHEL-43147] - x86/mpparse: Switch to new init callbacks (David Arcari) [RHEL-43147] - x86/mpparse: Provide separate early/late callbacks (David Arcari) [RHEL-43147] - x86/dtb: Rename x86_dtb_init() (David Arcari) [RHEL-43147] - x86/mpparse: Prepare for callback separation (David Arcari) [RHEL-43147] - x86/xen/smp_pv: Prepare for separate mpparse callbacks (David Arcari) [RHEL-43147] - x86/mpparse: Rename default_find_smp_config() (David Arcari) [RHEL-43147] - x86/xen/smp_pv: Remove cpudata fiddling (David Arcari) [RHEL-43147] - x86/cpu/topology: Assign hotpluggable CPUIDs during init (David Arcari) [RHEL-43147] - x86/cpu/topology: Reject unknown APIC IDs on ACPI hotplug (David Arcari) [RHEL-43147] - x86/topology: Add a mechanism to track topology via APIC IDs (David Arcari) [RHEL-43147] - x86/cpu: Detect real BSP on crash kernels (David Arcari) [RHEL-43147] - x86/cpu/topology: Rework possible CPU management (David Arcari) [RHEL-43147] - x86/cpu/topology: Sanitize the APIC admission logic (David Arcari) [RHEL-43147] - x86/cpu/topology: Use a data structure for topology info (David Arcari) [RHEL-43147] - x86/cpu/topology: Simplify APIC registration (David Arcari) [RHEL-43147] - x86/cpu/topology: Confine topology information (David Arcari) [RHEL-43147] - x86/mpparse: Use new APIC registration function (David Arcari) [RHEL-43147] - x86/acpi: Use new APIC registration functions (David Arcari) [RHEL-43147] - x86/cpu/topology: Provide separate APIC registration functions (David Arcari) [RHEL-43147] - x86/cpu/topology: Move registration out of APIC code (David Arcari) [RHEL-43147] - x86/apic/msi: Use DOMAIN_BUS_GENERIC_MSI for HPET/IO-APIC domain search (David Arcari) [RHEL-43147] - x86/apic: Use a proper define for invalid ACPI CPU ID (David Arcari) [RHEL-43147] - x86/apic: Remove yet another dubious callback (David Arcari) [RHEL-43147] - x86/apic: Remove the pointless writeback of boot_cpu_physical_apicid (David Arcari) [RHEL-43147] - x86/mpparse: Remove the physid_t bitmap wrapper (David Arcari) [RHEL-43147] - x86/apic: Remove check_apicid_used() and ioapic_phys_id_map() (David Arcari) [RHEL-43147] - x86/ioapic: Simplify setup_ioapic_ids_from_mpc_nocheck() (David Arcari) [RHEL-43147] - x86/ioapic: Make io_apic_get_unique_id() simpler (David Arcari) [RHEL-43147] - x86/apic: Get rid of get_physical_broadcast() (David Arcari) [RHEL-43147] - x86/ioapic: Replace some more set bit nonsense (David Arcari) [RHEL-43147] - x86/platform/ce4100: Dont override x86_init.mpparse.setup_ioapic_ids (David Arcari) [RHEL-43147] - x86/apic: Remove unused phys_pkg_id() callback (David Arcari) [RHEL-43147] - arch/x86: Fix typos (David Arcari) [RHEL-43147] - x86/cpu/topology: Make the APIC mismatch warnings complete (David Arcari) [RHEL-43147] - x86/cpu: Remove topology.c (David Arcari) [RHEL-43147] - x86/cpu: Make topology_amd_node_id() use the actual node info (David Arcari) [RHEL-43147] - x86/cpu: Use common topology code for HYGON (David Arcari) [RHEL-43147] - x86/cpu: Use common topology code for AMD (David Arcari) [RHEL-43147] - x86/cpu: Provide an AMD/HYGON specific topology parser (David Arcari) [RHEL-43147] - x86/cpu: Provide cpuid_read() et al. (David Arcari) [RHEL-43147] - x86/cpu: Use common topology code for Intel (David Arcari) [RHEL-43147] - x86/cpu: Provide a sane leaf 0xb/0x1f parser (David Arcari) [RHEL-43147] - x86/cpu: Move __max_die_per_package to common.c (David Arcari) [RHEL-43147] - x86/cpu: Use common topology code for Centaur and Zhaoxin (David Arcari) [RHEL-43147] - x86/cpu: Add legacy topology parser (David Arcari) [RHEL-43147] - x86/cpu: Provide cpu_init/parse_topology() (David Arcari) [RHEL-43147] - drivers: base: Move cpu_dev_init() after node_dev_init() (David Arcari) [RHEL-43147] - base/node.c: initialize the accessor list before registering (David Arcari) [RHEL-43147] - Revert "x86/topology: Fix max_siblings calculation for some hybrid cpus" (David Arcari) [RHEL-43147] Resolves: RHEL-43147, RHEL-54768 Signed-off-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2024-09-02 20:14:05 +00:00
RHEL_MINOR = 6
#
# 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-553.el9 * Wed Jan 15 2025 Rado Vrbovsky <rvrbovsk@redhat.com> [5.14.0-553.el9] - Revert "perf trace augmented_raw_syscalls: Add more checks to pass the verifier" (Michael Petlan) [RHEL-70429] - powerpc/book3s64/hugetlb: Fix disabling hugetlb when fadump is active (Mamatha Inamdar) [RHEL-73488] - loop: fix type of block size (Ming Lei) [RHEL-63718] - Revert "drm/amd/display: use ARCH_HAS_KERNEL_FPU_SUPPORT" (Robert Foss) [RHEL-53570] - Revert "drm/xe/observation: Drop empty sysctl table entry" (Robert Foss) [RHEL-53570] - redhat: Remove video from singlemods list in filter-modules.sh.rhel (Robert Foss) [RHEL-53570] - redhat: Add wmi to overrides list in filter-modules.sh.rhel (Robert Foss) [RHEL-53570] - redhat: Remove drm_display_helper from mod-internal.list (Robert Foss) [RHEL-53570] - redhat: Add xe to drmdrvs list in filter-modules.sh.rhel (Robert Foss) [RHEL-53570] - kconfig: Add Selects to DRM_GEM_SHMEM_HELPER (Robert Foss) [RHEL-53570] - drm: dp: Fix dp_aux_ep_match argument types (Robert Foss) [RHEL-53570] - drm/bridge-connector: move to DRM_DISPLAY_HELPER module (Robert Foss) [RHEL-53570] - redhat: Add drm_display_helper to mod-internal.list (Robert Foss) [RHEL-53570] - redhat: Add drm_hdmi_state_helper_test to mod-internal.list (Robert Foss) [RHEL-53570] - Revert "drm/ast: Request PCI BAR with devres" (Robert Foss) [RHEL-53570] - Revert "fs: Convert aops->write_end to take a folio" (Robert Foss) [RHEL-53570] - Revert "fs: Convert aops->write_begin to take a folio" (Robert Foss) [RHEL-53570] - drm: Fix __assign_str arguments (Robert Foss) [RHEL-53570] - Revert "move asm/unaligned.h to linux/unaligned.h" (Robert Foss) [RHEL-53570] - Revert "drm: fixed: Don't use "proxy" headers" (Robert Foss) [RHEL-53570] - Revert "drm/i915/gt: Use kmemdup_array instead of kmemdup for multiple allocation" (Robert Foss) [RHEL-53570] - Revert "drm/fb-helper: Set skip_panic if the drm driver supports drm panic" (Robert Foss) [RHEL-53570] - Revert "mm: kvmalloc: align kvrealloc() with krealloc()" (Robert Foss) [RHEL-53570] - Revert "introduce fd_file(), convert all accessors to it." (Robert Foss) [RHEL-53570] - Revert "fs: move FMODE_UNSIGNED_OFFSET to fop_flags" (Robert Foss) [RHEL-53570] - include/drm: Include bitops.h instead of wordpart.h (Robert Foss) [RHEL-53570] - redhat/configs: Add new configs from drm 6.12 backport (Robert Foss) [RHEL-53570] - Merge DRM changes from upstream v6.11..v6.12 (Robert Foss) [RHEL-53570] - Revert "drm/i915: Reject async flips with bigjoiner" (Robert Foss) [RHEL-53570] - drm: Fix __assign_str arguments (Robert Foss) [RHEL-53570] - Revert "virtio: convert the rest virtio_find_vqs() users to virtio_find_vqs_info()" (Robert Foss) [RHEL-53570] - Revert "udmabuf: pin the pages using memfd_pin_folios() API" (Robert Foss) [RHEL-53570] - drm/intel: intel headers were moved to include/drm/intel/ (Robert Foss) [RHEL-53570] - drm/xe: Include bitops.h instead of wordpart.h (Robert Foss) [RHEL-53570] - drm/dsi: Fix const struct device_driver change (Robert Foss) [RHEL-53570] - redhat/configs: Add new configs from drm 6.11 backport (Robert Foss) [RHEL-53570] - Merge DRM changes from upstream v6.10..v6.11 (Robert Foss) [RHEL-53570] - redhat/configs: Enable CONFIG_DRM_XE (Robert Foss) [RHEL-64034] - redhat/configs: Add new configs from drm 6.10 backport (Robert Foss) [RHEL-53570] - Merge DRM changes from upstream v6.9.11..v6.10 (Robert Foss) [RHEL-53570] - platform/x86: panasonic-laptop: Add support for programmable buttons (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: Fix SINF array out of bounds accesses (David Arcari) [RHEL-55365] - platform/x86: use PLATFORM_DEVID_NONE instead of -1 (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: Use acpi_video_get_backlight_type() (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: filter out duplicate volume up/down/mute keypresses (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: don't report duplicate brightness key-presses (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: revert "Resolve hotkey double trigger bug" (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: sort includes alphabetically (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: de-obfuscate button codes (David Arcari) [RHEL-55365] - platform/x86: panasonic-laptop: Replace snprintf in show functions with sysfs_emit (David Arcari) [RHEL-55365] - x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation (David Arcari) [RHEL-68394] - x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines (David Arcari) [RHEL-68394] - x86/cpu/intel: Switch to new Intel CPU model defines (David Arcari) [RHEL-68394] - powerpc/fadump: Move fadump_cma_init to setup_arch() after initmem_init() (Mamatha Inamdar) [RHEL-73627] - powerpc/fadump: Reserve page-aligned boot_memory_size during fadump_reserve_mem (Mamatha Inamdar) [RHEL-73627] - powerpc/fadump: Refactor and prepare fadump_cma_init for late init (Mamatha Inamdar) [RHEL-73627] - redhat: Drop bpftool from kernel spec (Viktor Malik) [RHEL-73479] - igc: Unlock on error in igc_io_resume() (Corinna Vinschen) [RHEL-49819] - igc: Move the MULTI GBT AN Control Register to _regs file (Corinna Vinschen) [RHEL-49819] - igc: Add Energy Efficient Ethernet ability (Corinna Vinschen) [RHEL-49819] - igc: Get rid of spurious interrupts (Corinna Vinschen) [RHEL-49819] - igc: Add MQPRIO offload support (Corinna Vinschen) [RHEL-49819] - igc: Fix qbv tx latency by setting gtxoffset (Corinna Vinschen) [RHEL-49819] - igc: Fix reset adapter logics when tx mode change (Corinna Vinschen) [RHEL-49819] - igc: Fix qbv_config_change_errors logics (Corinna Vinschen) [RHEL-49819] - igc: Fix packet still tx after gate close by reducing i226 MAC retry buffer (Corinna Vinschen) [RHEL-49819] - igc: Fix double reset adapter triggered from a single taprio cmd (Corinna Vinschen) [RHEL-49819] - igc: Remove the internal 'eee_advert' field (Corinna Vinschen) [RHEL-49819] - Revert "igc: fix a log entry using uninitialized netdev" (Corinna Vinschen) [RHEL-49819] - igc: fix a log entry using uninitialized netdev (Corinna Vinschen) [RHEL-49819] - igc: Add Tx hardware timestamp request for AF_XDP zero-copy packet (Corinna Vinschen) [RHEL-49819] Resolves: RHEL-49819, RHEL-53570, RHEL-55365, RHEL-63718, RHEL-64034, RHEL-68394, RHEL-70429, RHEL-73479, RHEL-73488, RHEL-73627 Signed-off-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2025-01-15 16:04:00 +00:00
RHEL_RELEASE = 553
kernel-5.14.0-73.el9 * Sun Mar 20 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-73.el9] - CI: Use 9.0-rt branch for rhel-9 realtime_check (Juri Lelli) - redhat: enable zstream release numbering for rhel 9.0 (Herton R. Krzesinski) - redhat: change kabi tarballs to use the package release (Herton R. Krzesinski) - redhat: generate distgit changelog in genspec.sh as well (Herton R. Krzesinski) - redhat: make genspec prefer metadata from git notes (Herton R. Krzesinski) - redhat: use tags from git notes for zstream to generate changelog (Herton R. Krzesinski) - CI: Add disttag setting (Veronika Kabatova) - CI: Drop c9s config (Veronika Kabatova) - virtio-net: fix pages leaking when building skb in big mode (Laurent Vivier) [2042559] - lib/iov_iter: initialize "flags" in new pipe_buffer (Carlos Maiolino) [2060869] {CVE-2022-0847} - redhat/configs: Make CRYPTO_ECDH algos built-in (Simo Sorce) [2062199] - crypto: api - Move cryptomgr soft dependency into algapi (Vladis Dronov) [2062199] - crypto: api - Fix boot-up crash when crypto manager is disabled (Vladis Dronov) [2062199] - crypto: api - Do not create test larvals if manager is disabled (Vladis Dronov) [2062199] - crypto: api - Export crypto_boot_test_finished (Vladis Dronov) [2062199] - crypto: api - Fix built-in testing dependency failures (Vladis Dronov) [2062199] - redhat/configs: Add CRYPTO_AES_ARM64 config explicitly (Vladis Dronov) [2062199] - crypto: arm64/aes-ce - stop using SIMD helper for skciphers (Vladis Dronov) [2062199] - crypto: arm64/aes-neonbs - stop using SIMD helper for skciphers (Vladis Dronov) [2062199] - redhat: change default dist suffix for RHEL 9.0 (Herton R. Krzesinski) - selftests: kvm: Check whether SIDA memop fails for normal guests (Thomas Huth) [2050813] - KVM: s390: Return error on SIDA memop on normal guest (Thomas Huth) [2050813] - block: kabi: reserve space for block layer public structure (Ming Lei) [2057238] - block: kabi: reserve space for blk-mq related structure (Ming Lei) [2057238] - block: kabi: reserve space for bsg related structure (Ming Lei) [2057238] - block: kabi: reserve space for integrity related structure (Ming Lei) [2057238] - scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop (Dick Kennedy) [2054866] - x86/MCE/AMD, EDAC/mce_amd: Support non-uniform MCA bank type enumeration (Aristeu Rozanski) [1898165 2047430 2047446] - x86/MCE/AMD, EDAC/mce_amd: Add new SMCA bank types (Aristeu Rozanski) [1898165 2047430 2047446] - EDAC/amd64: Add support for AMD Family 19h Models 10h-1Fh and A0h-AFh (Aristeu Rozanski) [1898165 2047430 2047446] - EDAC: Add RDDR5 and LRDDR5 memory types (Aristeu Rozanski) [1898165 2047430 2047446] - drm/amdgpu: Register MCE notifier for Aldebaran RAS (Aristeu Rozanski) [1898165 2047430 2047446] - x86/MCE/AMD: Export smca_get_bank_type symbol (Aristeu Rozanski) [1898165 2047430 2047446] - PCI/ACPI: Fix acpi_pci_osc_control_set() kernel-doc comment (Mark Langsdorf) [2049635] - PCI/ACPI: Check for _OSC support in acpi_pci_osc_control_set() (Mark Langsdorf) [2049635] - PCI/ACPI: Move _OSC query checks to separate function (Mark Langsdorf) [2049635] - PCI/ACPI: Move supported and control calculations to separate functions (Mark Langsdorf) [2049635] - PCI/ACPI: Remove OSC_PCI_SUPPORT_MASKS and OSC_PCI_CONTROL_MASKS (Mark Langsdorf) [2049635] - nvmet-tcp: fix missing unmainted messages (Chris Leech) [2054441] - dm stats: fix too short end duration_ns when using precise_timestamps (Benjamin Marzinski) [2051798] - dm: fix double accounting of flush with data (Benjamin Marzinski) [2051798] - dm: interlock pending dm_io and dm_wait_for_bios_completion (Benjamin Marzinski) [2051798] - dm: properly fix redundant bio-based IO accounting (Benjamin Marzinski) [2051798] - dm: revert partial fix for redundant bio-based IO accounting (Benjamin Marzinski) [2051798] - block: add bio_start_io_acct_time() to control start_time (Benjamin Marzinski) [2051798] - scsi: mpt3sas: Fix incorrect system timestamp (Tomas Henzl) [2049631] - scsi: mpt3sas: Fix system going into read-only mode (Tomas Henzl) [2049631] - scsi: mpt3sas: Fix kernel panic during drive powercycle test (Tomas Henzl) [2049631] - redhat/configs: enable mellanox platform drivers to support LED, fan & watchdog devices (Ivan Vecera) [2057491] - x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define (David Arcari) [2040022] - x86/cpu: Add Raptor Lake to Intel family (David Arcari) [2040022] - powerpc/64: Move paca allocation later in boot (Desnes A. Nunes do Rosario) [2055566] - powerpc: Set crashkernel offset to mid of RMA region (Desnes A. Nunes do Rosario) [2055566] - selftests: kvm: Check whether SIDA memop fails for normal guests (Thomas Huth) [2060814] - KVM: s390: Return error on SIDA memop on normal guest (Thomas Huth) [2060814] - igb: refactor XDP registration (Corinna Vinschen) [2054379] - igc: avoid kernel warning when changing RX ring parameters (Corinna Vinschen) [2054379] - redhat/configs: Enable CONFIG_ACER_WIRELESS (Peter Georg) [2025985] Resolves: rhbz#2025985, rhbz#2054379, rhbz#2060814, rhbz#2055566, rhbz#2040022 Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
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
#
# 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