From 4b70444246165a02d0c835248cfd48105c19d60d Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 23 Jun 2020 09:44:18 -0500
Subject: kernel-5.8.0-0.rc2.20200623gitdd0d718152e4.1

* Tue Jun 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200623gitdd0d718152e4.1]
- dd0d718152e4 rebase
- Add new bpf man pages ("Justin M. Forbes")
- Add default option for CONFIG_ARM64_BTI_KERNEL to pending-common so that eln kernels build ("Justin M. Forbes")
- Updated changelog for the release based on 625d3449788f (Fedora Kernel Team)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel-aarch64-debug-rhel.config |  1 +
 kernel-aarch64-rhel.config       |  1 +
 kernel.spec                      | 20 ++++++++++++++------
 sources                          |  6 +++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8af0e5ef9..d85ed1884 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -223,6 +223,7 @@ CONFIG_ARCH_XGENE=y
 CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_ARM64_BTI=y
 CONFIG_ARM64_CNP=y
 CONFIG_ARM64_CRYPTO=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c246db13f..6ce573d4e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -223,6 +223,7 @@ CONFIG_ARCH_XGENE=y
 CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_ARM64_BTI=y
 CONFIG_ARM64_CNP=y
 CONFIG_ARM64_CRYPTO=y
diff --git a/kernel.spec b/kernel.spec
index 92be11e8e..47efcf0c9 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.rc2.20200622git625d3449788f.1
+%global distro_build 0.rc2.20200623gitdd0d718152e4.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.rc2.20200622git625d3449788f.1
+%define pkgrelease 0.rc2.20200623gitdd0d718152e4.1
 
 # This is needed to do merge window version magic
 %define patchlevel 8
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20200622git625d3449788f.1%{?buildid}%{?dist}
+%define specrelease 0.rc2.20200623gitdd0d718152e4.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-20200622git625d3449788f.tar.xz
+Source0: linux-20200623gitdd0d718152e4.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1279,8 +1279,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200622git625d3449788f -c
-mv linux-20200622git625d3449788f linux-%{KVERREL}
+%setup -q -n kernel-20200623gitdd0d718152e4 -c
+mv linux-20200623gitdd0d718152e4 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2663,6 +2663,8 @@ fi
 %{_sysconfdir}/bash_completion.d/bpftool
 %{_mandir}/man8/bpftool-cgroup.8.gz
 %{_mandir}/man8/bpftool-gen.8.gz
+%{_mandir}/man8/bpftool-iter.8.gz
+%{_mandir}/man8/bpftool-link.8.gz
 %{_mandir}/man8/bpftool-map.8.gz
 %{_mandir}/man8/bpftool-prog.8.gz
 %{_mandir}/man8/bpftool-perf.8.gz
@@ -2785,6 +2787,12 @@ fi
 #
 #
 %changelog
+* Tue Jun 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200623gitdd0d718152e4.1]
+- dd0d718152e4 rebase
+- Add new bpf man pages ("Justin M. Forbes")
+- Add default option for CONFIG_ARM64_BTI_KERNEL to pending-common so that eln kernels build ("Justin M. Forbes")
+- Updated changelog for the release based on 625d3449788f (Fedora Kernel Team)
+
 * Mon Jun 22 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200622git625d3449788f.1]
 - 625d3449788f rebase
 - Updated changelog for the release based on 1b5044021070 (Fedora Kernel Team)
diff --git a/sources b/sources
index 5edff297d..255ebb646 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200622git625d3449788f.tar.xz) = bf46c32075c8243fc745a826c97f32415f1fa9cb0a57544006ddabbfad8febe4656cceac0ac65839f80582719382c3eb0c90999496cdc81a4781bb97fa9e998d
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc2.20200622git625d3449788f.1.tar.bz2) = 0758bc8477806d4aba4e90958da73d9dca82ec545a32a42e5c289d3558453244162c2da59f7849a409fcda343082f9ac4c31de757856f47ae435c28ec5df0ec6
-SHA512 (kernel-kabi-dw-5.8.0-0.rc2.20200622git625d3449788f.1.tar.bz2) = 8a1c402e9230d7e191d1fbbccdd20ee703a2df279624d3a6ec2e303b11f0d55540eb2b4bc272f83a8bc65b90f5006aded362295f425433ed5e12bdffba64a297
+SHA512 (linux-20200623gitdd0d718152e4.tar.xz) = 97aae10305fac7924fd7919f45c092af2e62856565b5e4a1d6e8891b0f768acba4bf1feff19f99d8512d0c0040f511943d088e2ba4857a2c63690ea95dac174d
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc2.20200623gitdd0d718152e4.1.tar.bz2) = afb78860485aeea4ca1dbe1d750abc6d1fb9431d12f8f8fc40d3ddb28cd70de01b6210fc39dd29d2780efae5116b798d82f6f818f33be30314a031a8149c16f3
+SHA512 (kernel-kabi-dw-5.8.0-0.rc2.20200623gitdd0d718152e4.1.tar.bz2) = 8a1545b36c2b137d8921fdd670ba6f345db0abec72b162e51607f5c92c6d91c109ea50ab6f9e04d103b34dcf7363184c34741fffd9da7ca287b62f65199f2d00
-- 
cgit