diff --git a/Makefile.rhelver b/Makefile.rhelver index fd73efa..c64edb5 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 39 +RHEL_RELEASE = 40 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.39 +RTBUILD:=.40 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 5e67466..9237e5f 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -3919,7 +3919,7 @@ CONFIG_NF_REJECT_IPV6=m # CONFIG_NFSD_BLOCKLAYOUT is not set CONFIG_NFSD_FAULT_INJECTION=y # CONFIG_NFSD_FLEXFILELAYOUT is not set -# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set +CONFIG_NFS_DISABLE_UDP_SUPPORT=y CONFIG_NFSD=m CONFIG_NFSD_PNFS=y CONFIG_NFSD_SCSILAYOUT=y @@ -6059,7 +6059,7 @@ CONFIG_STRIP_ASM_SYMS=y # CONFIG_SUNDANCE is not set CONFIG_SUN_PARTITION=y CONFIG_SUNRPC_DEBUG=y -# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set +CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 363a337..aa3a7f4 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -3900,7 +3900,7 @@ CONFIG_NF_REJECT_IPV6=m # CONFIG_NFSD_BLOCKLAYOUT is not set # CONFIG_NFSD_FAULT_INJECTION is not set # CONFIG_NFSD_FLEXFILELAYOUT is not set -# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set +CONFIG_NFS_DISABLE_UDP_SUPPORT=y CONFIG_NFSD=m CONFIG_NFSD_PNFS=y CONFIG_NFSD_SCSILAYOUT=y @@ -6037,7 +6037,7 @@ CONFIG_STRIP_ASM_SYMS=y # CONFIG_SUNDANCE is not set CONFIG_SUN_PARTITION=y CONFIG_SUNRPC_DEBUG=y -# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set +CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m diff --git a/kernel.spec b/kernel.spec index 09135ac..283392b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 39 +%global distro_build 40 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 39.rt21.39.el9 +%define pkgrelease 40.rt21.40.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 39.rt21.39%{?buildid}%{?dist} +%define specrelease 40.rt21.40%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -705,7 +705,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-39.rt21.39.el9.tar.xz +Source0: linux-5.14.0-40.rt21.40.el9.tar.xz Source1: Makefile.rhelver @@ -1433,8 +1433,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-39.rt21.39.el9 -c -mv linux-5.14.0-39.rt21.39.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-40.rt21.40.el9 -c +mv linux-5.14.0-40.rt21.40.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3081,6 +3081,52 @@ fi # # %changelog +* Fri Jan 14 2022 Juri Lelli [5.14.0-40.rt21.40.el9] +- cpu/hotplug: Remove deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- livepatch: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- coresight: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- hwmon: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- tracing: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- padata: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- crypto: virtio - Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- platform/x86: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- powerpc: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- x86/mce/inject: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- x86/microcode: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- x86/mtrr: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- x86/mmiotrace: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- workqueue: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- net/iucv: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- s390/sclp: replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- s390: replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- net: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- virtio_net: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- ACPI: processor: Replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- PM: sleep: s2idle: Replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- cpufreq: Replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- powercap: intel_rapl: Replace deprecated CPU-hotplug functions (Prarit Bhargava) [2023079] +- sgi-xpc: Replace deprecated CPU-hotplug functions. (Prarit Bhargava) [2023079] +- Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Neal Gompa) [2019937] +- sctp: remove unreachable code from sctp_sf_violation_chunk() (Xin Long) [2024909] +- sctp: return true only for pathmtu update in sctp_transport_pl_toobig (Xin Long) [2024909] +- sctp: subtract sctphdr len in sctp_transport_pl_hlen (Xin Long) [2024909] +- sctp: reset probe_timer in sctp_transport_pl_update (Xin Long) [2024909] +- sctp: allow IP fragmentation when PLPMTUD enters Error state (Xin Long) [2024909] +- sctp: fix transport encap_port update in sctp_vtag_verify (Xin Long) [2024909] +- sctp: account stream padding length for reconf chunk (Xin Long) [2024909] +- sctp: break out if skb_header_pointer returns NULL in sctp_rcv_ootb (Xin Long) [2024909] +- sctp: add vtag check in sctp_sf_ootb (Xin Long) [2003494] {CVE-2021-3772} +- sctp: add vtag check in sctp_sf_do_8_5_1_E_sa (Xin Long) [2003494] {CVE-2021-3772} +- sctp: add vtag check in sctp_sf_violation (Xin Long) [2003494] {CVE-2021-3772} +- sctp: fix the processing for COOKIE_ECHO chunk (Xin Long) [2003494] {CVE-2021-3772} +- sctp: fix the processing for INIT_ACK chunk (Xin Long) [2003494] {CVE-2021-3772} +- sctp: fix the processing for INIT chunk (Xin Long) [2003494] {CVE-2021-3772} +- sctp: use init_tag from inithdr for ABORT chunk (Xin Long) [2003494] {CVE-2021-3772} +- drm/nouveau: clean up all clients on device removal (Karol Herbst) [1911185] {CVE-2020-27820} +- drm/nouveau: Add a dedicated mutex for the clients list (Karol Herbst) [1911185] {CVE-2020-27820} +- drm/nouveau: use drm_dev_unplug() during device removal (Karol Herbst) [1911185] {CVE-2020-27820} +- redhat/configs: NFS: disable UDP, insecure enctypes (Benjamin Coddington) [1952863] + * Thu Jan 13 2022 Juri Lelli [5.14.0-39.rt21.39.el9] - cpuidle: pseries: Do not cap the CEDE0 latency in fixup_cede0_latency() (Gustavo Walbon) [2029870] - cpuidle: pseries: Fixup CEDE0 latency only for POWER10 onwards (Gustavo Walbon) [2029870] diff --git a/sources b/sources index e04b19d..059d3a3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c -SHA512 (linux-5.14.0-39.rt21.39.el9.tar.xz) = f649c3feddf3cc097ca3cbd51bc64694652babd745dd51fc41395fec974b9ae9a2ff4845bd6b66c1cb3b030aa1c4f25d7919f8d62bf0c1b5b3b37b20ff589d11 -SHA512 (kernel-abi-stablelists-5.14.0-39.tar.bz2) = dc99aafc19384aacb596b4534b048727d8fea7cc0403b81236dc3f1c07c33cff4fef383849486ca379e9e88c713beccafde36384519f7cbddc04b6e65a6d15fc -SHA512 (kernel-kabi-dw-5.14.0-39.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-40.rt21.40.el9.tar.xz) = 5434bb173467bdd7df306d6b529e1ef20b204a5a1a939cec458743a7b95695c5bfc5ee35cd3fb0ba6c2afb5c3f88dc207b2d61b0319e00e52a9c1897cab70bb3 +SHA512 (kernel-abi-stablelists-5.14.0-40.tar.bz2) = 158be2d650cd79d88ad4831e024ed7edc4fcfce38130af8866f60989be60bc5dc6ca309d2c63cd647a9c96b4d8ce29b7689a66d8ff468216bab16acd4e89fa68 +SHA512 (kernel-kabi-dw-5.14.0-40.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914