2021-08-30 22:48:52 +00:00
|
|
|
RHEL_MAJOR = 9
|
2022-03-08 17:46:13 +00:00
|
|
|
RHEL_MINOR = 1
|
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-135.el9
* Thu Jul 21 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-135.el9]
- PCI/PM: Fix bridge_d3_blacklist[] Elo i2 overwrite of Gigabyte X299 (Myron Stowe) [2015786]
- PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold (Myron Stowe) [2015786]
- PCI/ACPI: Allow D3 only if Root Port can signal and wake from D3 (Myron Stowe) [2015786]
- thunderbolt: Do not make DROM read success compulsory (Myron Stowe) [2015786]
- thunderbolt: Do not resume routers if UID is not set (Myron Stowe) [2015786]
- thunderbolt: Retry DROM reads for more failure scenarios (Myron Stowe) [2015786]
- PCI: PM: Fix ordering of operations in pci_back_from_sleep() (Myron Stowe) [2015786]
- PCI: PM: Do not call platform_pci_power_manageable() unnecessarily (Myron Stowe) [2015786]
- PCI: PM: Make pci_choose_state() call pci_target_state() (Myron Stowe) [2015786]
- PCI: PM: Rearrange pci_target_state() (Myron Stowe) [2015786]
- PCI: PM: Simplify acpi_pci_power_manageable() (Myron Stowe) [2015786]
- PCI: PM: Drop struct pci_platform_pm_ops (Myron Stowe) [2015786]
- PCI: ACPI: PM: Do not use pci_platform_pm_ops for ACPI (Myron Stowe) [2015786]
- PCI: PM: Do not use pci_platform_pm_ops for Intel MID PM (Myron Stowe) [2015786]
- driver core: Split device_platform_notify() (Myron Stowe) [2015786]
- software nodes: Split software_node_notify() (Myron Stowe) [2015786]
- PCI: PM: Enable PME if it can be signaled from D3cold (Myron Stowe) [2015786]
- PCI: PM: Avoid forcing PCI_D0 for wakeup reasons inconsistently (Myron Stowe) [2015786]
- PCI: Use pci_update_current_state() in pci_enable_device_flags() (Myron Stowe) [2015786]
- net: tipc: fix possible refcount leak in tipc_sk_create() (Xin Long) [2106046]
- tipc: fix use-after-free Read in tipc_named_reinit (Xin Long) [2106046]
- tipc: check attribute length for bearer name (Xin Long) [2106046]
- nvdimm/blk: add error handling support for add_disk() (Ming Lei) [2103992]
- nvdimm/blk: avoid calling del_gendisk() on early failures (Ming Lei) [2103992]
- nvdimm/btt: add error handling support for add_disk() (Ming Lei) [2103992]
- nvdimm/btt: use goto error labels on btt_blk_init() (Ming Lei) [2103992]
- nvdimm/btt: do not call del_gendisk() if not needed (Ming Lei) [2103992]
- nvdimm/pmem: use add_disk() error handling (Ming Lei) [2103992]
- mmc: block: Add error handling support for add_disk() (Ming Lei) [2103992]
- memstick: mspro_block: Add error handling support for add_disk() (Ming Lei) [2103992]
- netfilter: nf_tables: stricter validation of element data (Florian Westphal) [2104592] {CVE-2022-34918}
- net: openvswitch: fix misuse of the cached connection on tuple changes (Timothy Redaelli) [2104139]
- ethtool: Fix get module eeprom fallback (Davide Caratti) [2103977]
- veth: Add updating of trans_start (Davide Caratti) [2103977]
- selftests: mptcp: Initialize variables to quiet gcc 12 warnings (Davide Caratti) [2103906]
- mptcp: fix conflict with <netinet/in.h> (Davide Caratti) [2103906]
- selftests: mptcp: more stable diag tests (Davide Caratti) [2103906]
- mptcp: fix race on unaccepted mptcp sockets (Davide Caratti) [2103906]
- mptcp: consistent map handling on failure (Davide Caratti) [2103906]
- mptcp: fix shutdown vs fallback race (Davide Caratti) [2103906]
- mptcp: invoke MP_FAIL response when needed (Davide Caratti) [2103906]
- mptcp: introduce MAPPING_BAD_CSUM (Davide Caratti) [2103906]
- mptcp: fix error mibs accounting (Davide Caratti) [2103906]
- selftests: mptcp: add MP_FAIL reset testcase (Davide Caratti) [2103906]
- mptcp: Do not traverse the subflow connection list without lock (Davide Caratti) [2103906]
- mptcp: Check for orphaned subflow before handling MP_FAIL timer (Davide Caratti) [2103906]
- mptcp: stop using the mptcp_has_another_subflow() helper (Davide Caratti) [2103906]
- net: sched: add barrier to fix packet stuck problem for lockless qdisc (Davide Caratti) [2103902]
- net: sched: fixed barrier to prevent skbuff sticking in qdisc backlog (Davide Caratti) [2103902]
- tipc: move bc link creation back to tipc_node_create (Xin Long) [2086388]
- netfilter: nf_tables: replace BUG_ON by element length check (Florian Westphal) [2102148]
- netfilter: nf_log: incorrect offset to network header (Florian Westphal) [2102148]
- netfilter: conntrack: fix crash due to confirmed bit load reordering (Florian Westphal) [2102148]
- netfilter: nft_set_pipapo: release elements in clone from abort path (Florian Westphal) [2102148]
- netfilter: nf_tables: avoid skb access on nf_stolen (Florian Westphal) [2102148]
- netfilter: nf_tables: consolidate rule verdict trace call (Florian Westphal) [2102148]
- netfilter: br_netfilter: do not skip all hooks with 0 priority (Florian Westphal) [2102148]
- netfilter: nft_dynset: restore set element counter when failing to update (Florian Westphal) [2102148]
- selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh (Florian Westphal) [2102148]
- netfilter: use get_random_u32 instead of prandom (Florian Westphal) [2102148]
- netfilter: nf_tables: bail out early if hardware offload is not supported (Florian Westphal) [2102148]
- netfilter: nf_tables: memleak flow rule from commit path (Florian Westphal) [2102148]
- netfilter: nf_tables: release new hooks on unsupported flowtable flags (Florian Westphal) [2102148]
- netfilter: nf_tables: always initialize flowtable hook list in transaction (Florian Westphal) [2102148]
- netfilter: nf_tables: delete flowtable hooks via transaction list (Florian Westphal) [2102148]
- netfilter: nf_tables: hold mutex on netns pre_exit path (Florian Westphal) [2102148]
- netfilter: conntrack: re-fetch conntrack after insertion (Florian Westphal) [2102148]
- netfilter: flowtable: move dst_check to packet path (Florian Westphal) [2102148]
- netfilter: flowtable: fix TCP flow teardown (Florian Westphal) [2102148]
- netfilter: flowtable: pass flowtable to nf_flow_table_iterate() (Florian Westphal) [2102148]
- netfilter: nft_flow_offload: fix offload with pppoe + vlan (Florian Westphal) [2102148]
- netfilter: nft_flow_offload: skip dst neigh lookup for ppp devices (Florian Westphal) [2102148]
- netfilter: flowtable: fix excessive hw offload attempts after failure (Florian Westphal) [2102148]
- netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit (Florian Westphal) [2102148]
- netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6 (Florian Westphal) [2102148]
- netfilter: socket: icmp6: fix use-after-scope (Florian Westphal) [2102148]
- selftests/net: fix section name when using xdp_dummy.o (Hangbin Liu) [2103541]
- selftests/net: enable lo.accept_local in psock_snd test (Hangbin Liu) [2103541]
- tunnels: do not assume mac header is set in skb_tunnel_check_pmtu() (Guillaume Nault) [2101491]
- erspan: do not assume transport header is always set (Guillaume Nault) [2101491]
- ip_gre: test csum_start instead of transport header (Guillaume Nault) [2101491]
- udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister() (Guillaume Nault) [2101491]
- tcp: fix tcp_mtup_probe_success vs wrong snd_cwnd (Paolo Abeni) [2101465]
- tcp: add accessors to read/set tp->snd_cwnd (Paolo Abeni) [2101465]
- ipv6: take care of disable_policy when restoring routes (Hangbin Liu) [2100718]
- mld: respect RCU rules in ip6_mc_source() and ip6_mc_msfilter() (Hangbin Liu) [2100718]
- net/ipv6/mcast: Use struct_size() helper (Hangbin Liu) [2100718]
- gso: do not skip outer ip header in case of ipip and net_failover (Hangbin Liu) [2100718]
Resolves: rhbz#2015786, rhbz#2106046, rhbz#2103992, rhbz#2104592, rhbz#2104139, rhbz#2103977, rhbz#2103906, rhbz#2103902, rhbz#2086388, rhbz#2102148, rhbz#2103541, rhbz#2101491, rhbz#2101465, rhbz#2100718
Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
2022-07-21 17:58:42 +00:00
|
|
|
RHEL_RELEASE = 135
|
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
|