diff --git a/.kernel-automotive.metadata b/.kernel-automotive.metadata index 33c2473..f14b0a1 100644 --- a/.kernel-automotive.metadata +++ b/.kernel-automotive.metadata @@ -1 +1 @@ -c4cc213f3b0ee895b57f9621046876b5685bf6b2 SOURCES/linux-5.14.0-59.25.el9.tar.xz +bed3367e8f85fff9bcb8a9777af46bc917af4d58 SOURCES/linux-5.14.0-60.26.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index f184a27..7e69da7 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,14 +12,14 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 59 +RHEL_RELEASE = 60 # # Automotive Release # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.25 +AUTOMOTIVEBUILD:=.26 # # Early y+1 numbering @@ -51,4 +51,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.60 +RTBUILD:=.61 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 2b2c13e..137eb8e 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 59 +%global distro_build 60 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -123,13 +123,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 59.25.el9 +%define pkgrelease 60.26.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 59.25%{?buildid}%{?dist} +%define specrelease 60.26%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -277,7 +277,7 @@ Summary: The Linux kernel %endif %if %{with_automotive} -%global automotivebuild .25 +%global automotivebuild .26 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-59.25.el9.tar.xz +Source0: linux-5.14.0-60.26.el9.tar.xz Source1: Makefile.rhelver @@ -1410,8 +1410,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-59.25.el9 -c -mv linux-5.14.0-59.25.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-60.26.el9 -c +mv linux-5.14.0-60.26.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3068,6 +3068,56 @@ fi # # %changelog +* Wed Feb 23 2022 Scott Weaver [5.14.0-60.26.el9] +- Revert "Merge: NVMe command id changes for use-after-free CQE detection" (Juri Lelli) +- net: Write lock dev_base_lock without disabling bottom halves. (Luis Claudio R. Goncalves) [2016279] +- crypto: jitter - add oversampling of noise source (Herbert Xu) [2036816] +- Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" (Guillaume Nault) [2027560] +- Change "-auto" suffix to fix CI automotive pipeline issues (Julio Faracco) +- nvme: drop unused variable ctrl in nvme_setup_cmd (John Meneghini) [2044616] +- nvme: increment request genctr on completion (John Meneghini) [2044616] +- nvme-pci: Fix abort command id (John Meneghini) [2044616] +- nvme: add command id quirk for apple controllers (John Meneghini) [2044616] +- nvme: move nvme_multi_css into nvme.h (John Meneghini) [2044616] +- nvme: code command_id with a genctr for use-after-free validation (John Meneghini) [2044616] +- nvme-pci: limit maximum queue depth to 4095 (John Meneghini) [2044616] +- selftests: Calculate udpgso segment count without header adjustment (Xin Long) [2044129] +- udp: using datalen to cap ipv6 udp max gso segments (Xin Long) [2044129] +- inet_diag: fix kernel-infoleak for UDP sockets (Xin Long) [2044129] +- udp: using datalen to cap max gso segments (Xin Long) [2044129] +- sctp: hold endpoint before calling cb in sctp_transport_lookup_process (Xin Long) [2043823] +- sctp: use call_rcu to free endpoint (Xin Long) [2043823] +- sctp: move hlist_node and hashent out of sctp_ep_common (Xin Long) [2043823] +- sctp: make the raise timer more simple and accurate (Xin Long) [2043823] +- nfsd: fix use-after-free due to delegation race (Benjamin Coddington) [1991929] +- bonding: Fix extraction of ports from the packet headers (Jonathan Toppins) [2042548] +- bonding: fix ad_actor_system option setting to default (Jonathan Toppins) [2042548] +- bonding: make tx_rebalance_counter an atomic (Jonathan Toppins) [2042548] +- bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed (Jonathan Toppins) [2042548] +- bonding: 3ad: pass parameter bond_params by reference (Jonathan Toppins) [2042548] +- bonding: complain about missing route only once for A/B ARP probes (Jonathan Toppins) [2042548] +- bonding: improve nl error msg when device can't be enslaved because of IFF_MASTER (Jonathan Toppins) [2042548] +- bonding: combine netlink and console error messages (Jonathan Toppins) [2042548] +- net, bonding: Refactor bond_xmit_hash for use with xdp_buff (Jonathan Toppins) [2042548] +- net: bonding: bond_alb: Remove the dependency on ipx network layer (Jonathan Toppins) [2042548] +- bonding: add new option lacp_active (Jonathan Toppins) [1951951 2042548] +- bonding: 3ad: fix the concurrency between __bond_release_one() and bond_3ad_state_machine_handler() (Jonathan Toppins) [2042548] +- fget: clarify and improve __fget_files() implementation (Miklos Szeredi) [2030418] {CVE-2021-4083} +- fget: check that the fd still exists after getting a ref to it (Miklos Szeredi) [2030418] {CVE-2021-4083} +- ipv6: Continue processing multipath route even if gateway attribute is invalid (Hangbin Liu) [2041401] +- ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route (Hangbin Liu) [2041401] +- ipv6: Do cleanup if attribute validation fails in multipath route (Hangbin Liu) [2041401] +- ipv6: Check attribute length for RTA_GATEWAY in multipath route (Hangbin Liu) [2041401] +- ipv6: fix memory leak in fib6_rule_suppress (Hangbin Liu) [2041401] +- net: nexthop: reduce rcu synchronizations when replacing resilient groups (Hangbin Liu) [2041401] +- net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group (Hangbin Liu) [2041401] +- net: ipv6: add fib6_nh_release_dsts stub (Hangbin Liu) [2041401] +- ipv6: fix typos in __ip6_finish_output() (Hangbin Liu) [2041401] +- igbvf: Refactor trace (Corinna Vinschen) [2040322] +- igbvf: fix double free in `igbvf_probe` (Corinna Vinschen) [2040322] +- bnx2x: Fix enabling network interfaces without VFs (Manish Chopra) [1998304] +- tun: fix bonding active backup with arp monitoring (Jonathan Toppins) [2050837] + * Wed Feb 23 2022 Scott Weaver [5.14.0-59.25.el9] - mm/memcg: Pass a bool to refill_stock() (Leah Leshchinsky) [2028891] - mm/memcg: Enable on PREEMPT_RT again. (Leah Leshchinsky) [2028891]