summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-07-10 14:21:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-07-10 14:21:31 -0500
commitd8d578bfa82493a49b71c8665b2f48c3e6df3617 (patch)
tree3b04d65bd9b32db06687898eae50c5a69eb25101
parent1e802729aad6c95148f8b582528eae7ba1cb263d (diff)
downloadkernel-d8d578bfa82493a49b71c8665b2f48c3e6df3617.tar.gz
kernel-d8d578bfa82493a49b71c8665b2f48c3e6df3617.tar.xz
kernel-d8d578bfa82493a49b71c8665b2f48c3e6df3617.zip
kernel-5.8.0-0.rc4.20200710git42f82040ee66.1
* Fri Jul 10 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200710git42f82040ee66.1] - 42f82040ee66 rebase - Updated changelog for the release based on dcde237b9b0e (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--0001-bpf-Add-tech-preview-taint-for-syscall.patch4
-rw-r--r--0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch2
-rw-r--r--0001-modules-add-rhelversion-MODULE_INFO-tag.patch2
-rw-r--r--kernel.spec20
-rw-r--r--sources6
5 files changed, 19 insertions, 15 deletions
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
index 7fbdadd8e..6b048f448 100644
--- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch
+++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
@@ -27,10 +27,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
1 file changed, 6 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 8f5546ec2d1f..772054412fab 100644
+index dcdf7649f4b7..2751eb3cfe06 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
-@@ -4091,11 +4091,17 @@ static int bpf_iter_create(union bpf_attr *attr)
+@@ -4096,11 +4096,17 @@ static int bpf_iter_create(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
index a5f4f93da..a9f2600da 100644
--- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
+++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
@@ -66,7 +66,7 @@ index 28be75396242..0a0081b10edb 100644
#define TAINT_FLAGS_COUNT 32
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 8da159936bab..8f5546ec2d1f 100644
+index 859053ddf05b..dcdf7649f4b7 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
index 529d7761a..3fd0f125c 100644
--- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
+++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
@@ -94,7 +94,7 @@ index 2e6670860d27..8c35a5db7d7e 100644
/* Exported symbols */
diff --git a/kernel/module.c b/kernel/module.c
-index bee1c25ca5c5..6f97025b27d7 100644
+index aa183c9ac0a2..dc323b3f5838 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = { \
diff --git a/kernel.spec b/kernel.spec
index 7742e67f9..fb34f2f18 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc4.20200709git0bddd227f3dc.1
+%global distro_build 0.rc4.20200710git42f82040ee66.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc4.20200709git0bddd227f3dc.1
+%define pkgrelease 0.rc4.20200710git42f82040ee66.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20200709git0bddd227f3dc.1%{?buildid}%{?dist}
+%define specrelease 0.rc4.20200710git42f82040ee66.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200709git0bddd227f3dc.tar.xz
+Source0: linux-20200710git42f82040ee66.tar.xz
Source1: Makefile.rhelver
@@ -1280,8 +1280,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200709git0bddd227f3dc -c
-mv linux-20200709git0bddd227f3dc linux-%{KVERREL}
+%setup -q -n kernel-20200710git42f82040ee66 -c
+mv linux-20200710git42f82040ee66 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2792,8 +2792,12 @@ fi
#
#
%changelog
-* Thu Jul 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200709git0bddd227f3dc.1]
-- 0bddd227f3dc rebase
+* Fri Jul 10 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200710git42f82040ee66.1]
+- 42f82040ee66 rebase
+- Updated changelog for the release based on dcde237b9b0e (Fedora Kernel Team)
+
+* Wed Jul 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200708gitdcde237b9b0e.1]
+- dcde237b9b0e rebase
- Updated changelog for the release based on v5.8-rc4 (Fedora Kernel Team)
* Mon Jul 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.1]
diff --git a/sources b/sources
index 55f73499c..954ca2540 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200709git0bddd227f3dc.tar.xz) = b7a823aadd4eebfd68bedf50857a76c040555887daf31dcfc08ba764b22447ee49d7167585d7f93d450636f5a373468cce29bbee2ee5bd17d142b807a9bbf986
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.20200709git0bddd227f3dc.1.tar.bz2) = 304af56a8ca13c1622f884b3b94cba0e5d9fae8fdfcf58444bb8e9874bf78a837f49da86d23598172671e23436a64aadf2066eb3ecc942a8772137bc84387343
-SHA512 (kernel-kabi-dw-5.8.0-0.rc4.20200709git0bddd227f3dc.1.tar.bz2) = 353fc0e5bdafb9fa8ff1d132f97fd194b718bb5cbfd5b97c6b5df2127aa2ce3147be861d5ec728f1372c2e3c8357e193f33b06a2c680dc642cd86589242504c1
+SHA512 (linux-20200710git42f82040ee66.tar.xz) = 77d322c8d2c61509d58b7da128336b93374a02b0a45f7a0a5b585bc1be6adaef271f5a9b6ed599c8f5e7e6316a536410ec30e6fa5aeab88bec416350bd89d48f
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.20200710git42f82040ee66.1.tar.bz2) = 0986fcb9c13844241a0c9fdd112342745d390aa984b16ab6ad26ce3cfa2da8cf62b855e33b597a6daddf61c8e22f6e8363a394a8d4c7748ee6faf838bf50d12e
+SHA512 (kernel-kabi-dw-5.8.0-0.rc4.20200710git42f82040ee66.1.tar.bz2) = 8bdef520cdcdaa3ffa3c69e728eb9ccc67a174d884bad7417426bd6d6290018d0f64ed58590b3d2edf422528f07e1c0eeaf0a70583e778a366db1796f6685baf