summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-05 17:54:28 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-05 17:54:28 +0100
commit43ec62afb03a5a6c95a44dad73f3fbee9da91bcd (patch)
tree17d2fab7f62d0d9f94e0a3b3da2610d3159a165e
parent3366ef5d5f7dfb45d8d6e389491522ba785e9310 (diff)
parentda1e46223709895e51e61c839d8215b3edf9252b (diff)
downloadkernel-43ec62afb03a5a6c95a44dad73f3fbee9da91bcd.tar.gz
kernel-43ec62afb03a5a6c95a44dad73f3fbee9da91bcd.tar.xz
kernel-43ec62afb03a5a6c95a44dad73f3fbee9da91bcd.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel.spec19
-rw-r--r--patch-5.10.0-redhat.patch15
-rw-r--r--sources6
4 files changed, 16 insertions, 26 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4049c6053..dd94b4be0 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 = 62
+RHEL_RELEASE = 64
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 2546a4a55..5a82321bb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc2.62
+%global distro_build 0.rc2.20201105git4ef8451b3326.64
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -97,13 +97,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.10.0
-%define pkgrelease 0.rc2.62
+%define pkgrelease 0.rc2.20201105git4ef8451b3326.64
# This is needed to do merge window version magic
%define patchlevel 10
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.62%{?buildid}%{?dist}
+%define specrelease 0.rc2.20201105git4ef8451b3326.64%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -193,7 +193,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.10
@@ -536,7 +536,7 @@ BuildRequires: python3-docutils
BuildRequires: zlib-devel binutils-devel
%endif
%if %{with_selftests}
-BuildRequires: llvm
+BuildRequires: clang llvm
%ifnarch %{arm}
BuildRequires: numactl-devel
%endif
@@ -594,7 +594,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.10-rc2.tar.xz
+Source0: linux-20201105git4ef8451b3326.tar.xz
Source1: Makefile.rhelver
@@ -1238,8 +1238,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.10-rc2 -c
-mv linux-5.10-rc2 linux-%{KVERREL}
+%setup -q -n kernel-20201105git4ef8451b3326 -c
+mv linux-20201105git4ef8451b3326 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2681,6 +2681,9 @@ fi
#
#
%changelog
+* Wed Nov 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.20201104git4ef8451b3326.62.test]
+- 4ef8451b3326 rebase
+
* Mon Nov 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.61.test]
- v5.10-rc2 rebase
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch
index 624e0d5ac..78acb206f 100644
--- a/patch-5.10.0-redhat.patch
+++ b/patch-5.10.0-redhat.patch
@@ -69,8 +69,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- tools/perf/Makefile.config | 1 +
- 72 files changed, 1583 insertions(+), 189 deletions(-)
+ 71 files changed, 1582 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -3090,15 +3089,3 @@ index a28045dc9e7f..36b8b9fcad48 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
-index 6890fc4b063a..ce8516e4de34 100644
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -749,6 +749,7 @@ else
- PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
- PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null)
- PERL_EMBED_CCOPTS := $(filter-out -specs=%,$(PERL_EMBED_CCOPTS))
-+ PERL_EMBED_CCOPTS := $(filter-out -flto=auto -ffat-lto-objects, $(PERL_EMBED_CCOPTS))
- PERL_EMBED_LDOPTS := $(filter-out -specs=%,$(PERL_EMBED_LDOPTS))
- FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
-
diff --git a/sources b/sources
index b07574629..e8127a9d3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.10-rc2.tar.xz) = 8e9f49eef62e016d802f267009cdd4dbbd23b1ec5fc4cea93fa0076adaf34317cfd2c1a47a005f211e8f7580e9f758691d9fa25940bb6e72725a9d8d4b95c6c8
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc2.62.tar.bz2) = 640fd6b2730037cd95ad3c0dfced48fa9858483432e3fd1f691414d38b582e74d32a7d3183dd635992ee62c4d5d6796b0d37ec65c43868962cca5f2bad7222f2
-SHA512 (kernel-kabi-dw-5.10.0-0.rc2.62.tar.bz2) = a7548499df0ebc3ab657fdcd6206a8236227b4e05a4a3dfae4c3bf8f56ebfd9f0b6af8944b993f19f2dff00cbc877bf1a81c4d053e5596e833b5cc011bf06015
+SHA512 (linux-20201105git4ef8451b3326.tar.xz) = ddc7e3859d7c69bba6326415cbc1a2172f781c72377e2475e771487d68d4fc8cfad5c80d81c8d3bd8613cc1426bc4eea9c3cdf353240fabe9c311d47294d1a51
+SHA512 (kernel-abi-whitelists-5.10.0-0.rc2.20201105git4ef8451b3326.64.tar.bz2) = 21aee0f72145a3e5691cb3876f0b957231f732cbf6461126978701190c5eab721040b318eba3f096d96aa6a1f30e4906975526b380f3f49e4bca3bb93fdf0a80
+SHA512 (kernel-kabi-dw-5.10.0-0.rc2.20201105git4ef8451b3326.64.tar.bz2) = fad2187e261680e80131dab97b2acaecbb802815b75ffdd0cbb1ce1993836c028f5d58f448486e0d86f572f2524ffd31cf9c38cf14b95d5f55ebc4525aeed6f3