diff --git a/Makefile.rhelver b/Makefile.rhelver index 79a6c6b..fc53aa3 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 25 +RHEL_RELEASE = 33 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.3 +RTBUILD:=.4 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 8d48edc..fb82757 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -467,6 +467,7 @@ CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y CONFIG_BPF_SYSCALL=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_BRCMDBG is not set CONFIG_BRCMFMAC=m @@ -917,8 +918,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m @@ -2021,6 +2022,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m +# CONFIG_HID_SEMITEK is not set CONFIG_HID_SENSOR_ACCEL_3D=m CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set @@ -2322,15 +2324,16 @@ CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m # CONFIG_INET_DIAG_DESTROY is not set -CONFIG_INET_DIAG=m +CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m -CONFIG_INET_MPTCP_DIAG=m -CONFIG_INET_RAW_DIAG=m +CONFIG_INET_MPTCP_DIAG=y +CONFIG_INET_RAW_DIAG=y +CONFIG_INET_TCP_DIAG=y CONFIG_INET_TUNNEL=m -CONFIG_INET_UDP_DIAG=m +CONFIG_INET_UDP_DIAG=y CONFIG_INET=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_BNXT_RE=m @@ -3695,7 +3698,7 @@ CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y -CONFIG_NETLINK_DIAG=m +CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y @@ -4082,7 +4085,7 @@ CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_PA12203001 is not set -CONFIG_PACKET_DIAG=m +CONFIG_PACKET_DIAG=y CONFIG_PACKET=y # CONFIG_PACKING is not set CONFIG_PAGE_EXTENSION=y @@ -5839,6 +5842,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set +# CONFIG_SYSTEM_REVOCATION_KEYS is not set # CONFIG_SYSTEM_REVOCATION_LIST is not set CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" @@ -6167,7 +6171,7 @@ CONFIG_UIO_PCI_GENERIC=m # CONFIG_UNISYSSPAR is not set # CONFIG_UNISYS_VISORBUS is not set CONFIG_UNIX98_PTYS=y -CONFIG_UNIX_DIAG=m +CONFIG_UNIX_DIAG=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y # CONFIG_UNUSED_SYMBOLS is not set diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index ac43cf9..06c40b7 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -467,6 +467,7 @@ CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y CONFIG_BPF_SYSCALL=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_BRCMDBG is not set CONFIG_BRCMFMAC=m @@ -917,8 +918,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m @@ -2005,6 +2006,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m +# CONFIG_HID_SEMITEK is not set CONFIG_HID_SENSOR_ACCEL_3D=m CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set @@ -2306,15 +2308,16 @@ CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m # CONFIG_INET_DIAG_DESTROY is not set -CONFIG_INET_DIAG=m +CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m -CONFIG_INET_MPTCP_DIAG=m -CONFIG_INET_RAW_DIAG=m +CONFIG_INET_MPTCP_DIAG=y +CONFIG_INET_RAW_DIAG=y +CONFIG_INET_TCP_DIAG=y CONFIG_INET_TUNNEL=m -CONFIG_INET_UDP_DIAG=m +CONFIG_INET_UDP_DIAG=y CONFIG_INET=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_BNXT_RE=m @@ -3676,7 +3679,7 @@ CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y -CONFIG_NETLINK_DIAG=m +CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y @@ -4063,7 +4066,7 @@ CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_PA12203001 is not set -CONFIG_PACKET_DIAG=m +CONFIG_PACKET_DIAG=y CONFIG_PACKET=y # CONFIG_PACKING is not set # CONFIG_PAGE_EXTENSION is not set @@ -5817,6 +5820,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set +# CONFIG_SYSTEM_REVOCATION_KEYS is not set # CONFIG_SYSTEM_REVOCATION_LIST is not set CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" @@ -6145,7 +6149,7 @@ CONFIG_UIO_PCI_GENERIC=m # CONFIG_UNISYSSPAR is not set # CONFIG_UNISYS_VISORBUS is not set CONFIG_UNIX98_PTYS=y -CONFIG_UNIX_DIAG=m +CONFIG_UNIX_DIAG=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y # CONFIG_UNUSED_SYMBOLS is not set diff --git a/kernel.spec b/kernel.spec index 1f8b0c7..5310a8b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc3.25 +%global distro_build 0.rc4.33 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 0.rc3.25.rt3.3 +%define pkgrelease 0.rc4.33.rt3.4 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.25.rt3.3%{?buildid}%{?dist} +%define specrelease 0.rc4.33.rt3.4%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -543,6 +543,9 @@ ExclusiveOS: Linux %ifnarch %{nobuildarches} Requires: %{name}-core-uname-r = %{KVERREL} Requires: %{name}-modules-uname-r = %{KVERREL} +%if %{with_realtime} +Requires: realtime-setup +%endif %endif @@ -571,6 +574,7 @@ BuildRequires: audit-libs-devel BuildRequires: java-devel BuildRequires: libbpf-devel BuildRequires: libbabeltrace-devel +BuildRequires: libtraceevent-devel %ifnarch %{arm} s390x BuildRequires: numactl-devel %endif @@ -648,7 +652,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.0-0.rc3.25.rt3.3.tar.xz +Source0: linux-5.13.0-0.rc4.33.rt3.4.tar.xz Source1: Makefile.rhelver @@ -913,7 +917,7 @@ This package provides debug information for the perf package. # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list} %package -n python3-perf Summary: Python bindings for apps which will manipulate perf events @@ -1358,8 +1362,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.0-0.rc3.25.rt3.3 -c -mv linux-5.13.0-0.rc3.25.rt3.3 linux-%{KVERREL} +%setup -q -n kernel-5.13.0-0.rc4.33.rt3.4 -c +mv linux-5.13.0-0.rc4.33.rt3.4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2165,7 +2169,7 @@ InitBuildVars %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2378,7 +2382,7 @@ tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH %if %{with_perf} # perf tool binary and supporting scripts/binaries -%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace @@ -2713,8 +2717,7 @@ fi %files -n perf %{_bindir}/perf %{_libdir}/libperf-jvmti.so -%dir %{_libdir}/traceevent/plugins -%{_libdir}/traceevent/plugins/* +%exclude %{_libdir}/traceevent %dir %{_libexecdir}/perf-core %{_libexecdir}/perf-core/* %{_datadir}/perf-core/* @@ -2919,8 +2922,11 @@ fi # # %changelog -* Wed May 26 2021 Juri Lelli [5.13.0-0.rc3.25.rt3.3] -- kernel-5.13.0-0.rc3.25.el9 rebase +* Thu Jun 03 2021 Juri Lelli [5.13.0-0.rc4.33.rt3.4] +- kernel-5.13.0-0.rc4.33.el9 rebase +- Revert "eventfd: track eventfd_signal() recursion depth" (Juri Lelli) +- Revert "aio: prevent potential eventfd recursion on poll" (Juri Lelli) +- redhat: Add realtime-setup dependecy for kernel-rt metapackage (Juri Lelli) [1937013] - spec: Generate separate kernel-rt-kvm packages (Juri Lelli) - Add RT config options (Juri Lelli) - specfile: Add with_realtime (Juri Lelli) @@ -3074,6 +3080,21 @@ fi - kthread: Move prio/affinite change into the newly created thread (Sebastian Andrzej Siewior) - timers: Move clearing of base::timer_running under base::lock (Thomas Gleixner) - highmem: Don't disable preemption on RT in kmap_atomic() (Sebastian Andrzej Siewior) +- bpf: Fix unprivileged_bpf_disabled setup (Jiri Olsa) +- Enable CONFIG_BPF_UNPRIV_DEFAULT_OFF (Jiri Olsa) + +* Tue Jun 01 2021 Fedora Kernel Team [5.13.0-0.rc4.20210601gitc2131f7e73c9.32] +- configs/common/s390: disable CONFIG_QETH_{OSN,OSX} (Philipp Rudo) [1903201] + +* Fri May 28 2021 Fedora Kernel Team [5.13.0-0.rc3.20210528git97e5bf604b7a.28] +- nvme: nvme_mpath_init remove multipath check (Mike Snitzer) + +* Wed May 26 2021 Fedora Kernel Team [5.13.0-0.rc3.20210526gitad9f25d33860.27] +- team: mark team driver as deprecated (Hangbin Liu) [1945477] + +* Tue May 25 2021 Fedora Kernel Team [5.13.0-0.rc3.20210525gita050a6d2b7e8.26] +- Make CRYPTO_EC also builtin (Simo Sorce) [1947240] +- Do not hard-code a default value for DIST (David Ward) * Mon May 24 2021 Fedora Kernel Team [5.13.0-0.rc3.25] - Override %%{debugbuildsenabled} if the --with-release option is used (David Ward) diff --git a/sources b/sources index 8eb053d..4941df6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13.0-0.rc3.25.rt3.3.tar.xz) = 8cb53dcfbfa1d8f96195ebfcf2b8d656797d4f3ff078127cd8ffece5a2d20bb57f211292fc1388414cbca41f3701f9410725040ee51edb216732969b4b410d59 -SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.25.tar.bz2) = 5a1976224fc32b9c3bbaef862246532a864ba39577a27a608349164c51b677a2d2645925896cae3356ddaa940647c386d1f327ccccdc6a97eb09309c15067958 -SHA512 (kernel-kabi-dw-5.13.0-0.rc3.25.tar.bz2) = e45b300507ec12349a8254c8768cc7dda92a37e9b65da75435451bb54b95e4969ea8391be88e6d375adf603d2835196ca4bf4c33479e92f55970264b72d39522 +SHA512 (linux-5.13.0-0.rc4.33.rt3.4.tar.xz) = 5448dc79f70b84ed0bf08b04433617c7bff68b603912cabdf169a7f32d30897b8135601eaea5ebac9ab2ad51c2baa5395b2064dbec87f10a2c258d2afe0e1f65 +SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.33.tar.bz2) = df7944a99d473058b440ae04fad11cbbbd7de9513577dddf9a25c403cc8b857ba952670b25ce1394ba51e4a506cb594533558e3f9b51b929ff740ae5b5f0a740 +SHA512 (kernel-kabi-dw-5.13.0-0.rc4.33.tar.bz2) = da2010c48aefc88383605e7df741c1d61349a96b41adf72255a74b07ad027e12b8780d10bed8608156070a1b55535687f7dd237aa584e2d84759e125e2926cf1