kernel-5.13.0-0.rc3.20210526gitad9f25d33860.27
* Wed May 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210526gitad9f25d33860.27] - team: mark team driver as deprecated (Hangbin Liu) [1945477] Resolves: rhbz#1945477 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
7704c4a937
commit
005d54b78b
|
|
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
|||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 26
|
||||
RHEL_RELEASE = 27
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ https://gitlab.com/cki-project/kernel-ark/-/commit/3b0b403f2c1261ea8e4ab576e5a44
|
|||
https://gitlab.com/cki-project/kernel-ark/-/commit/42fcca9ea8f8acd6f561e9589f92462246e572ff
|
||||
42fcca9ea8f8acd6f561e9589f92462246e572ff Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled"
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/043900845a208ff1fd0ba71ad9c0f4da17c59243
|
||||
043900845a208ff1fd0ba71ad9c0f4da17c59243 team: mark team driver as deprecated
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/81cf9b7d49bb0a3786746e73d3090d97cefe301e
|
||||
81cf9b7d49bb0a3786746e73d3090d97cefe301e nvme: multipath: Change default of kernel NVMe multipath to be disabled
|
||||
|
||||
|
|
|
|||
25
kernel.spec
25
kernel.spec
|
|
@ -73,7 +73,7 @@ Summary: The Linux kernel
|
|||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 0
|
||||
|
||||
%global distro_build 0.rc3.20210525gita050a6d2b7e8.26
|
||||
%global distro_build 0.rc3.20210526gitad9f25d33860.27
|
||||
|
||||
%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.20210525gita050a6d2b7e8.26
|
||||
%define pkgrelease 0.rc3.20210526gitad9f25d33860.27
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 13
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc3.20210525gita050a6d2b7e8.26%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc3.20210526gitad9f25d33860.27%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
|
|
@ -546,6 +546,7 @@ BuildRequires: audit-libs-devel
|
|||
BuildRequires: java-devel
|
||||
BuildRequires: libbpf-devel
|
||||
BuildRequires: libbabeltrace-devel
|
||||
BuildRequires: libtraceevent-devel
|
||||
%ifnarch %{arm} s390x
|
||||
BuildRequires: numactl-devel
|
||||
%endif
|
||||
|
|
@ -623,7 +624,7 @@ BuildRequires: clang
|
|||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.13-rc3-39-ga050a6d2b7e8.tar.xz
|
||||
Source0: linux-5.13-rc3-43-gad9f25d33860.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
|
|
@ -875,7 +876,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
|
||||
|
|
@ -1292,8 +1293,8 @@ ApplyOptionalPatch()
|
|||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.13-rc3-39-ga050a6d2b7e8 -c
|
||||
mv linux-5.13-rc3-39-ga050a6d2b7e8 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.13-rc3-43-gad9f25d33860 -c
|
||||
mv linux-5.13-rc3-43-gad9f25d33860 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
|
|
@ -2073,7 +2074,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
|
||||
|
|
@ -2286,7 +2287,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
|
||||
|
||||
|
|
@ -2594,8 +2595,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/*
|
||||
|
|
@ -2795,6 +2795,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed May 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210526gitad9f25d33860.27]
|
||||
- team: mark team driver as deprecated (Hangbin Liu) [1945477]
|
||||
|
||||
* Tue May 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
drivers/message/fusion/mptsas.c | 10 +
|
||||
drivers/message/fusion/mptspi.c | 11 +
|
||||
drivers/net/ethernet/intel/ice/ice_main.c | 1 +
|
||||
drivers/net/team/team.c | 2 +
|
||||
drivers/net/wireguard/main.c | 7 +
|
||||
drivers/nvme/host/core.c | 22 +-
|
||||
drivers/nvme/host/multipath.c | 16 +-
|
||||
|
|
@ -67,7 +68,7 @@
|
|||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 1 +
|
||||
security/security.c | 6 +
|
||||
69 files changed, 1207 insertions(+), 187 deletions(-)
|
||||
70 files changed, 1209 insertions(+), 187 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
|
||||
index 75a9dd98e76e..3ff3291551f9 100644
|
||||
|
|
@ -1259,6 +1260,19 @@ index 4ee85a217c6f..494f392a8d56 100644
|
|||
|
||||
ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME);
|
||||
if (!ice_wq) {
|
||||
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
|
||||
index dd7917cab2b1..f6b43adb2ced 100644
|
||||
--- a/drivers/net/team/team.c
|
||||
+++ b/drivers/net/team/team.c
|
||||
@@ -3045,6 +3045,8 @@ static int __init team_module_init(void)
|
||||
if (err)
|
||||
goto err_nl_init;
|
||||
|
||||
+ mark_hardware_deprecated(DRV_NAME);
|
||||
+
|
||||
return 0;
|
||||
|
||||
err_nl_init:
|
||||
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
|
||||
index 7a7d5f1a80fc..de28e2633761 100644
|
||||
--- a/drivers/net/wireguard/main.c
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-5.13-rc3-39-ga050a6d2b7e8.tar.xz) = 24986f19834b495121a4efeed0ac4ec22ebf1d2a3c4d873c0e75a93621879d5c330381bee8af6c2ef36ab23b49edd1f29980b0aee24536766b9343ea00c51d7a
|
||||
SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210525gita050a6d2b7e8.26.tar.bz2) = 9590130a1e23b8162e3a21755b4f85a56b8ec7ceb375fd7c0e8788ee18419fb1b2af1a95908c1cb4f60d3580da482e325bb8c50f5c97112152f9fe9e0c31aa3a
|
||||
SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210525gita050a6d2b7e8.26.tar.bz2) = 60b00b06371d5dcad260275d44706a728f59a63e9edb93aec8c008c413ad6426e0fcb5e66f325091c666910c68f97431e1d421b44cbed0ac19fbd8d5bf73c020
|
||||
SHA512 (linux-5.13-rc3-43-gad9f25d33860.tar.xz) = e77a1a9882ad788edde989734b48cc74979f495d6e15bd2d3bdd35a63f1cbc326a9b88e4485268e8fe599199c641c3ebaa96611a8fdde7b0613dd2181e20fcb6
|
||||
SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210526gitad9f25d33860.27.tar.bz2) = 285545a78faffdcae7c4049984e1ace1403831344e67cc2ac732863adf63fe87fbb2ffca9cf3df575c0cded2d0b08fb7204376a324e4067d44d57de761361169
|
||||
SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210526gitad9f25d33860.27.tar.bz2) = 3aeeafb1005f279600a3e2e4b88f28e629fce1baa1207b46e410268aa5ee70a5eedd65986e573aad538cdb18764b30a6b10ec856c2a352c02a484cba198b0149
|
||||
|
|
|
|||
Loading…
Reference in New Issue