Merge remote-tracking branch 'alma-origin/c9' into HEAD
This commit is contained in:
Stepan Oksanichenko
commit
7d67344b4b
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
SOURCES/linux-5.14.0-162.12.1.rt21.175.el9_1.tar.xz
|
||||
SOURCES/linux-5.14.0-162.18.1.rt21.181.el9_1.tar.xz
|
||||
SOURCES/rheldup3.x509
|
||||
SOURCES/rhelkpatch1.x509
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
a53c09a6ddb9d235dccbb18db9a2a278271ca18e SOURCES/linux-5.14.0-162.12.1.rt21.175.el9_1.tar.xz
|
||||
2fc0e1a2d66dd9ff8e78dbbf8d90673804eb009b SOURCES/linux-5.14.0-162.18.1.rt21.181.el9_1.tar.xz
|
||||
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
|
||||
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
|
||||
|
||||
@ -12,7 +12,7 @@ RHEL_MINOR = 1
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 162.12.1
|
||||
RHEL_RELEASE = 162.18.1
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
@ -66,4 +66,4 @@ ifneq ("$(ZSTREAM)", "yes")
|
||||
endif
|
||||
endif
|
||||
|
||||
RTBUILD:=.175
|
||||
RTBUILD:=.181
|
||||
|
||||
@ -6573,7 +6573,7 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y
|
||||
CONFIG_X86_ACPI_CPUFREQ=m
|
||||
CONFIG_X86_AMD_FREQ_SENSITIVITY=m
|
||||
CONFIG_X86_AMD_PLATFORM_DEVICE=y
|
||||
CONFIG_X86_AMD_PSTATE=y
|
||||
CONFIG_X86_AMD_PSTATE=m
|
||||
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
|
||||
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
||||
CONFIG_X86_CMPXCHG64=y
|
||||
|
||||
@ -6550,7 +6550,7 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y
|
||||
CONFIG_X86_ACPI_CPUFREQ=m
|
||||
CONFIG_X86_AMD_FREQ_SENSITIVITY=m
|
||||
CONFIG_X86_AMD_PLATFORM_DEVICE=y
|
||||
CONFIG_X86_AMD_PSTATE=y
|
||||
CONFIG_X86_AMD_PSTATE=m
|
||||
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
|
||||
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
||||
CONFIG_X86_CMPXCHG64=y
|
||||
|
||||
@ -121,13 +121,13 @@ Summary: The Linux kernel
|
||||
%define kversion 5.14
|
||||
|
||||
%define rpmversion 5.14.0
|
||||
%define pkgrelease 162.12.1.rt21.175.el9_1
|
||||
%define pkgrelease 162.18.1.rt21.181.el9_1
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 14
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 162.12.1.rt21.175%{?buildid}%{?dist}
|
||||
%define specrelease 162.18.1.rt21.181%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
@ -706,7 +706,7 @@ BuildRequires: lld
|
||||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.14.0-162.12.1.rt21.175.el9_1.tar.xz
|
||||
Source0: linux-5.14.0-162.18.1.rt21.181.el9_1.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
@ -1409,8 +1409,8 @@ ApplyOptionalPatch()
|
||||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.14.0-162.12.1.rt21.175.el9_1 -c
|
||||
mv linux-5.14.0-162.12.1.rt21.175.el9_1 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.14.0-162.18.1.rt21.181.el9_1 -c
|
||||
mv linux-5.14.0-162.18.1.rt21.181.el9_1 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
@ -3122,8 +3122,56 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Dec 21 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.12.1.rt21.175.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.12.1.rt21.175.el9_1 [2141817]
|
||||
* Thu Feb 09 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.18.1.rt21.181.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.18.1.rt21.181.el9_1 [2160463]
|
||||
- powerpc/pseries: Use lparcfg to reconfig VAS windows for DLPAR CPU (Steve Best) [2154305]
|
||||
- redhat/configs: Change the amd-pstate driver from builtin to loadable (David Arcari) [2151274]
|
||||
- powerpc/pseries/mobility: set NMI watchdog factor during an LPM (Steve Best) [2140085]
|
||||
- powerpc/watchdog: introduce a NMI watchdog's factor (Steve Best) [2140085]
|
||||
- watchdog: export lockup_detector_reconfigure (Steve Best) [2140085]
|
||||
- powerpc/mobility: wait for memory transfer to complete (Steve Best) [2140085]
|
||||
|
||||
* Fri Feb 03 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.17.1.rt21.180.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.17.1.rt21.180.el9_1 [2160463]
|
||||
- PCI: hv: Only reuse existing IRTE allocation for Multi-MSI (Emanuele Giuseppe Esposito) [2155459]
|
||||
- PCI: hv: Fix the definition of vector in hv_compose_msi_msg() (Emanuele Giuseppe Esposito) [2155459]
|
||||
- PCI: hv: Fix interrupt mapping for multi-MSI (Emanuele Giuseppe Esposito) [2155459]
|
||||
- PCI: hv: Reuse existing IRTE allocation in compose_msi_msg() (Emanuele Giuseppe Esposito) [2155459]
|
||||
- PCI: hv: Fix hv_arch_irq_unmask() for multi-MSI (Emanuele Giuseppe Esposito) [2155459]
|
||||
- PCI: hv: Fix multi-MSI to allow more than one MSI vector (Emanuele Giuseppe Esposito) [2155459]
|
||||
- proc: proc_skip_spaces() shouldn't think it is working on C strings (Wander Lairson Costa) [2152583] {CVE-2022-4378}
|
||||
- proc: avoid integer type confusion in get_proc_long (Wander Lairson Costa) [2152583] {CVE-2022-4378}
|
||||
- blk-mq: run queue no matter whether the request is the last request (Ming Lei) [2162535]
|
||||
- netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits (Florian Westphal) [2161727] {CVE-2023-0179}
|
||||
- nvme-tcp: fix regression that causes sporadic requests to time out (Gopal Tiwari) [2161344]
|
||||
- netfs: Fix dodgy maths (Xiubo Li) [2161418]
|
||||
- netfs: Fix missing xas_retry() calls in xarray iteration (Xiubo Li) [2161418]
|
||||
|
||||
* Thu Jan 26 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.16.1.rt21.179.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.16.1.rt21.179.el9_1 [2160463]
|
||||
- Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu (Ricardo Robaina) [2152943] {CVE-2022-3564}
|
||||
- gitlab-ci: use CI templates from production branch (Michael Hofmann)
|
||||
|
||||
* Fri Jan 20 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.15.1.rt21.178.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.15.1.rt21.178.el9_1 [2160463]
|
||||
- KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field (Thomas Huth) [2158815]
|
||||
- x86/fpu: Do not leak fpstate pointer on fork (Rafael Aquini) [2133083]
|
||||
- Revert "usb: typec: ucsi: add a common function ucsi_unregister_connectors()" (Torez Smith) [2153277]
|
||||
- i2c: ismt: Fix an out-of-bounds bug in ismt_access() (David Arcari) [2162681] {CVE-2022-2873}
|
||||
|
||||
* Thu Jan 12 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.14.1.rt21.177.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.14.1.rt21.177.el9_1 [2160463]
|
||||
- NFSD: fix use-after-free in __nfs42_ssc_open() (Benjamin Coddington) [2152817] {CVE-2022-4379}
|
||||
- PCI: hv: Fix synchronization between channel callback and hv_pci_bus_exit() (Mohammed Gamal) [2155930]
|
||||
- PCI: hv: Fix synchronization between channel callback and hv_compose_msi_msg() (Mohammed Gamal) [2155930]
|
||||
- PCI: hv: Use vmbus_requestor to generate transaction IDs for VMbus hardening (Mohammed Gamal) [2155930]
|
||||
- sched/core: Always flush pending blk_plug (Phil Auld) [2153792]
|
||||
- [redhat-rt] build: adjust RTBZ for 9.1.0-z2 (Patrick Talbert)
|
||||
|
||||
* Thu Jan 05 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.13.1.rt21.176.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.13.1.rt21.176.el9_1 [2141817]
|
||||
- scsi: qla2xxx: Fix crash when I/O abort times out (Nilesh Javali) [2152178]
|
||||
- net: mana: Fix race on per-CQ variable napi work_done (Emanuele Giuseppe Esposito) [2155145]
|
||||
|
||||
* Wed Dec 21 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.12.1.rt21.175.el9_1]
|
||||
- [rt] build kernel-rt-5.14.0-162.12.1.rt21.175.el9_1 [2141817]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user