diff --git a/Makefile.rhelver b/Makefile.rhelver index f1e2171..4a72973 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 = 32 +RHEL_RELEASE = 33 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.32 +RTBUILD:=.33 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 36ec117..ccc9e39 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -4608,7 +4608,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index c0987c5..c20651f 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -4588,7 +4588,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel.spec b/kernel.spec index fb36992..41859de 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 32 +%global distro_build 33 %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 32.rt21.32.el9 +%define pkgrelease 33.rt21.33.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 32.rt21.32%{?buildid}%{?dist} +%define specrelease 33.rt21.33%{?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-32.rt21.32.el9.tar.xz +Source0: linux-5.14.0-33.rt21.33.el9.tar.xz Source1: Makefile.rhelver @@ -1433,8 +1433,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-32.rt21.32.el9 -c -mv linux-5.14.0-32.rt21.32.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-33.rt21.33.el9 -c +mv linux-5.14.0-33.rt21.33.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3081,6 +3081,53 @@ fi # # %changelog +* Fri Dec 17 2021 Juri Lelli [5.14.0-33.rt21.33.el9] +- s390/kexec: handle R_390_PLT32DBL rela in arch_kexec_apply_relocations_add() (Philipp Rudo) [2023155] +- s390/kexec_file: fix error handling when applying relocations (Philipp Rudo) [2023155] +- s390/kexec_file: print some more error messages (Philipp Rudo) [2023155] +- udp: Validate checksum in udp_read_sock() (Xin Long) [2026952] +- net: udp: correct the document for udp_mem (Xin Long) [2026952] +- net: udp6: replace __UDP_INC_STATS() with __UDP6_INC_STATS() (Xin Long) [2026952] +- net: prefer socket bound to interface when not in VRF (Xin Long) [2026952] +- udp6: allow SO_MARK ctrl msg to affect routing (Xin Long) [2026952] +- net: udp: annotate data race around udp_sk(sk)->corkflag (Xin Long) [2026952] +- net/ipv4/udp_tunnel_core.c: remove superfluous header files from udp_tunnel_core.c (Xin Long) [2026952] +- udp_tunnel: Fix udp_tunnel_nic work-queue type (Xin Long) [2026952] +- selftests: add a test case for mirred egress to ingress (Hangbin Liu) [2025461] +- selftests/net: udpgso_bench_rx: fix port argument (Hangbin Liu) [2025461] +- selftests: net: test_vxlan_under_vrf: fix HV connectivity test (Hangbin Liu) [2025461] +- selftests: net: tls: remove unused variable and code (Hangbin Liu) [2025461] +- selftests/net: Fix reuseport_bpf_numa by skipping unavailable nodes (Hangbin Liu) [2025461] +- selftests: net: switch to socat in the GSO GRE test (Hangbin Liu) [2025461] +- selftests: net: properly support IPv6 in GSO GRE test (Hangbin Liu) [2025461] +- kselftests/net: add missed vrf_strict_mode_test.sh test to Makefile (Hangbin Liu) [2025461] +- kselftests/net: add missed setup_loopback.sh/setup_veth.sh to Makefile (Hangbin Liu) [2025461] +- kselftests/net: add missed icmp.sh test to Makefile (Hangbin Liu) [2025461] +- selftests: udp: test for passing SO_MARK as cmsg (Hangbin Liu) [2025461] +- selftests/net: update .gitignore with newly added tests (Hangbin Liu) [2025461] +- selftests: net: bridge: update IGMP/MLD membership interval value (Hangbin Liu) [2025461] +- selftests: lib: forwarding: allow tests to not require mz and jq (Hangbin Liu) [2025461] +- fcnal-test: kill hanging ping/nettest binaries on cleanup (Hangbin Liu) [2025461] +- selftests: net/fcnal: Test --{force,no}-bind-key-ifindex (Hangbin Liu) [2025461] +- selftests: nettest: Add --{force,no}-bind-key-ifindex (Hangbin Liu) [2025461] +- selftests: forwarding: Add IPv6 GRE hierarchical tests (Hangbin Liu) [2025461] +- selftests: forwarding: Add IPv6 GRE flat tests (Hangbin Liu) [2025461] +- testing: selftests: tc_common: Add tc_check_at_least_x_packets() (Hangbin Liu) [2025461] +- testing: selftests: forwarding.config.sample: Add tc flag (Hangbin Liu) [2025461] +- selftests: net: fib_nexthops: Wait before checking reported idle time (Hangbin Liu) [2025461] +- selftest: net: fix typo in altname test (Hangbin Liu) [2025461] +- selftests: add simple GSO GRE test (Hangbin Liu) [2025461] +- selftests/net: allow GRO coalesce test on veth (Hangbin Liu) [2025461] +- selftests/net: Use kselftest skip code for skipped tests (Hangbin Liu) [2025461] +- tools/net: Use bitwise instead of arithmetic operator for flags (Hangbin Liu) [2025461] +- selftests: vrf: Add test for SNAT over VRF (Hangbin Liu) [2025461] +- selftests/net: GRO coalesce test (Hangbin Liu) [2025461] +- selftests/net: remove min gso test in packet_snd (Hangbin Liu) [2025461] +- tipc: fix size validations for the MSG_CRYPTO type (Xin Long) [2020513] {CVE-2021-43267} +- redhat/configs: enable CONFIG_RD_ZSTD for rhel (Tao Liu) [2020132] +- powerpc/security: Use a mutex for interrupt exit code patching (Steve Best) [2019202] +- EDAC/mce_amd: Do not load edac_mce_amd module on guests (Aristeu Rozanski) [2000778] + * Thu Dec 16 2021 Juri Lelli [5.14.0-32.rt21.32.el9] - Revert "Merge: mm: update generic MM code to upstream v5.15" (Juri Lelli) - redhat: configs: explicitly unset CONFIG_DAMON (Rafael Aquini) [2023396] diff --git a/sources b/sources index 27adf42..655f6a5 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-32.rt21.32.el9.tar.xz) = a9e68247e555d6956556e79b3258d2f42c7464bc0e1af35564e24c377390800adfe5c6f8ec08e7a29437311dfd266f384932ba5c67c912db2a1b5f4d55cea251 -SHA512 (kernel-abi-stablelists-5.14.0-32.tar.bz2) = b50760c994fc09ca2b12f6b1e24b593453a54d49f57d18b1810adc461321787d7fb718bb96aeda51f5f73d8cfd47ef39249293ed9ff8b3f91f5dbaf40f99915f -SHA512 (kernel-kabi-dw-5.14.0-32.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-33.rt21.33.el9.tar.xz) = 319fc76ff9c0111d18c683c53a12b153f10a34fb398bef2d35cbdeb5897711ec37fbcc63f82b49d0084481b9156a3313e173ddedb3b4596775f6f5d555c0c6dd +SHA512 (kernel-abi-stablelists-5.14.0-33.tar.bz2) = e0ca0e4d70892939ca7893b56a525f364dd8c37ba1e5c6dab5bad6995e4f814a3bda67d85a798ee400ddc7349a65876bc9a55515fa78cef04917274317e7532f +SHA512 (kernel-kabi-dw-5.14.0-33.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914