diff --git a/Makefile.rhelver b/Makefile.rhelver index 4362a8b..4ee2c09 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 = 50 +RHEL_RELEASE = 51 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.50 +RTBUILD:=.51 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 353b0d4..3911fdd 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -1125,7 +1125,7 @@ CONFIG_DMI=y CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_MIRROR=m -# CONFIG_DM_MULTIPATH_HST is not set +CONFIG_DM_MULTIPATH_HST=m CONFIG_DM_MULTIPATH_IOA=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m @@ -3740,17 +3740,19 @@ CONFIG_NOUVEAU_DEBUG_PUSH=y # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set CONFIG_NOZOMI=m CONFIG_NR_CPUS=8192 -# CONFIG_NTB_AMD is not set +CONFIG_NTB_AMD=m # CONFIG_NTB_EPF is not set # CONFIG_NTB_IDT is not set -# CONFIG_NTB_INTEL is not set +CONFIG_NTB_INTEL=m CONFIG_NTB=m -# CONFIG_NTB_MSI is not set -# CONFIG_NTB_PERF is not set -# CONFIG_NTB_PINGPONG is not set +CONFIG_NTB_MSI_TEST=m +CONFIG_NTB_MSI=y +CONFIG_NTB_NETDEV=m +CONFIG_NTB_PERF=m +CONFIG_NTB_PINGPONG=m # CONFIG_NTB_SWITCHTEC is not set -# CONFIG_NTB_TOOL is not set -# CONFIG_NTB_TRANSPORT is not set +CONFIG_NTB_TOOL=m +CONFIG_NTB_TRANSPORT=m # CONFIG_NTFS_FS is not set # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index b0c100a..12d9888 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -1117,7 +1117,7 @@ CONFIG_DMI=y CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_MIRROR=m -# CONFIG_DM_MULTIPATH_HST is not set +CONFIG_DM_MULTIPATH_HST=m CONFIG_DM_MULTIPATH_IOA=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m @@ -3721,17 +3721,19 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set CONFIG_NOZOMI=m CONFIG_NR_CPUS=8192 -# CONFIG_NTB_AMD is not set +CONFIG_NTB_AMD=m # CONFIG_NTB_EPF is not set # CONFIG_NTB_IDT is not set -# CONFIG_NTB_INTEL is not set +CONFIG_NTB_INTEL=m CONFIG_NTB=m -# CONFIG_NTB_MSI is not set -# CONFIG_NTB_PERF is not set -# CONFIG_NTB_PINGPONG is not set +CONFIG_NTB_MSI_TEST=m +CONFIG_NTB_MSI=y +CONFIG_NTB_NETDEV=m +CONFIG_NTB_PERF=m +CONFIG_NTB_PINGPONG=m # CONFIG_NTB_SWITCHTEC is not set -# CONFIG_NTB_TOOL is not set -# CONFIG_NTB_TRANSPORT is not set +CONFIG_NTB_TOOL=m +CONFIG_NTB_TRANSPORT=m # CONFIG_NTFS_FS is not set # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y diff --git a/kernel.spec b/kernel.spec index 069cc06..2fc7315 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 50 +%global distro_build 51 %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 50.rt21.50.el9 +%define pkgrelease 51.rt21.51.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 50.rt21.50%{?buildid}%{?dist} +%define specrelease 51.rt21.51%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -708,7 +708,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-50.rt21.50.el9.tar.xz +Source0: linux-5.14.0-51.rt21.51.el9.tar.xz Source1: Makefile.rhelver @@ -1435,8 +1435,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-50.rt21.50.el9 -c -mv linux-5.14.0-50.rt21.50.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-51.rt21.51.el9 -c +mv linux-5.14.0-51.rt21.51.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1668,6 +1668,7 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/%{image_install_path} mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/systemtap %if %{with_debuginfo} mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path} %endif @@ -3028,6 +3029,7 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/systemtap\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ @@ -3086,6 +3088,47 @@ fi # # %changelog +* Tue Feb 01 2022 Juri Lelli [5.14.0-51.rt21.51.el9] +- selftests: bpf: Fix bind on used port (Felix Maurer) [2043528] +- Add packaged but empty /lib/modules//systemtap (Herton R. Krzesinski) [2012908] +- powerpc/bpf: Update ldimm64 instructions during extra pass (Yauheni Kaliuta) [2040549] +- RDMA/irdma: Don't arm the CQ more than two times if no CE for this CQ (Kamal Heib) [2039426] +- RDMA/irdma: Report correct WC errors (Kamal Heib) [2039426] +- RDMA/irdma: Fix a potential memory allocation issue in 'irdma_prm_add_pble_mem()' (Kamal Heib) [2039426] +- RDMA/irdma: Fix a user-after-free in add_pble_prm (Kamal Heib) [2039426] +- RDMA/irdma: Do not hold qos mutex twice on QP resume (Kamal Heib) [2039426] +- RDMA/irdma: Set VLAN in UD work completion correctly (Kamal Heib) [2039426] +- RDMA/irdma: Process extended CQ entries correctly (Kamal Heib) [2039426] +- RDMA/irdma: Report correct WC error when there are MW bind errors (Kamal Heib) [2039426] +- RDMA/irdma: Report correct WC error when transport retry counter is exceeded (Kamal Heib) [2039426] +- RDMA/irdma: Validate number of CQ entries on create CQ (Kamal Heib) [2039426] +- RDMA/irdma: Skip CQP ring during a reset (Kamal Heib) [2039426] +- redhat/configs: Enable CONFIG_DM_MULTIPATH_HST (Benjamin Marzinski) [2000835] +- RDMA/core: Don't infoleak GRH fields (Kamal Heib) [2036599] +- RDMA/uverbs: Check for null return of kmalloc_array (Kamal Heib) [2036599] +- RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string (Kamal Heib) [2036599] +- RDMA/cma: Ensure rdma_addr_cancel() happens before issuing more requests (Kamal Heib) [2036599] +- RDMA/cma: Fix listener leak in rdma_cma_listen_on_all() failure (Kamal Heib) [2036599] +- IB/cma: Do not send IGMP leaves for sendonly Multicast groups (Kamal Heib) [2036599] +- IB/core: Remove deprecated current_seq comments (Kamal Heib) [2036599] +- RDMA/iwcm: Release resources if iw_cm module initialization fails (Kamal Heib) [2036599] +- sched: padding for user_struct for KABI (Phil Auld) [2033084] +- sched: padding for signal_struct in linux/sched/signal.h (Phil Auld) [2033084] +- sched: padding for struct rq and related (Phil Auld) [2033084] +- sched: Padding for sched_domain and root_domain (Phil Auld) [2033084] +- sched: Padding for task_struct and related in include/linux/sched.h (Phil Auld) [2033084] +- hwmon: (k10temp) Support up to 12 CCDs on AMD Family of processors (David Arcari) [2022526] +- hwmon: (k10temp) Add support for AMD Family 19h Models 10h-1Fh and A0h-AFh (David Arcari) [2022526] +- hwmon: (k10temp) Remove unused definitions (David Arcari) [2022526] +- x86/amd_nb: Add AMD Family 19h Models (10h-1Fh) and (A0h-AFh) PCI IDs (David Arcari) [2022526] +- hwmon: (k10temp) Remove residues of current and voltage (David Arcari) [2022526] +- tipc: check for null after calling kmemdup (Xin Long) [2024993] +- tipc: only accept encrypted MSG_CRYPTO msgs (Xin Long) [2024993] +- tipc: constify dev_addr passing (Xin Long) [2024993] +- tipc: increase timeout in tipc_sk_enqueue() (Xin Long) [2024993] +- tipc: clean up inconsistent indenting (Xin Long) [2024993] +- redhat: configs: add CONFIG_NTB and related items (John Linville) [1874186] + * Mon Jan 31 2022 Juri Lelli [5.14.0-50.rt21.50.el9] - net: fix possible NULL deref in sock_reserve_memory (Paolo Abeni) [2028420] - mptcp: fix per socket endpoint accounting (Paolo Abeni) [2028420] diff --git a/sources b/sources index 906d313..0f517fe 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-50.rt21.50.el9.tar.xz) = 45f7634f5b6bf8b69322dbab6ba33501d24b527374d21744546492bf0acc1e5ffe8dd21875799a4449196c64c352a75f2e98937ca70a6ba09a5b73079bda1c38 -SHA512 (kernel-abi-stablelists-5.14.0-50.tar.bz2) = e97c27c3609e9c50aa17c5f78e02c59b3771dd728aa3163eec8943addae5cb770c47bf697438451d2fdb5b51636bb4f5dac742615001c9b71486506a9df23b19 -SHA512 (kernel-kabi-dw-5.14.0-50.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-51.rt21.51.el9.tar.xz) = 582a039ede86a1938ece50ab54b2a78c1fc51a47e9c889e6365bc78995f1f4c4d138077121a39e23635593fd6f0ff4f0e5ca90709c8c6a6f6e9b78afd5725757 +SHA512 (kernel-abi-stablelists-5.14.0-51.tar.bz2) = 690e55d703553c7e1f286c25d5566dc6360a8dee742380896a4b2ac0745c56e8c3fbb0a817643a31ebdee60063dd67299d025c81d837c7eb0163e86363a69b58 +SHA512 (kernel-kabi-dw-5.14.0-51.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914