From 0433fb292b371a0aa721adf20b5999c6d0233f49 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 16 Sep 2020 09:31:10 -0500
Subject: kernel-5.9.0-0.rc5.20200915gitfc4f28bb3daf.11

* Tue Sep 15 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc5.20200915gitfc4f28bb3daf.11]
- Merge ark-patches
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver |  2 +-
 kernel.spec      | 25 ++++++++++++++++++-------
 sources          |  6 +++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index e0ff8a074..b04cb77d9 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 = 11
+RHEL_RELEASE = 12
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 7e5528db2..0192c5af7 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.rc5.11
+%global distro_build 0.rc5.20200916gitfc4f28bb3daf.12
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.9.0
-%define pkgrelease 0.rc5.11
+%define pkgrelease 0.rc5.20200916gitfc4f28bb3daf.12
 
 # This is needed to do merge window version magic
 %define patchlevel 9
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.11%{?buildid}%{?dist}
+%define specrelease 0.rc5.20200916gitfc4f28bb3daf.12%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -166,7 +166,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.9
@@ -566,7 +566,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.9-rc5.tar.xz
+Source0: linux-20200916gitfc4f28bb3daf.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1284,8 +1284,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.9-rc5 -c
-mv linux-5.9-rc5 linux-%{KVERREL}
+%setup -q -n kernel-20200916gitfc4f28bb3daf -c
+mv linux-20200916gitfc4f28bb3daf linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2799,6 +2799,17 @@ fi
 #
 #
 %changelog
+* Tue Sep 15 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc5.20200915gitfc4f28bb3daf.11]
+- Merge ark-patches
+
+* Tue Sep 15 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc5.20200915gitfc4f28bb3daf.10.test]
+- fc4f28bb3daf rebase
+- vgacon: remove software scrollback support (Linus Torvalds)
+- fbcon: remove now unusued 'softback_lines' cursor() argument (Linus Torvalds)
+- fbcon: remove soft scrollback code (Linus Torvalds)
+- btrfs: fix wrong address when faulting in pages in the search ioctl (Filipe Manana)
+- Updated changelog for the release based on v5.9-rc5 (Fedora Kernel Team)
+
 * Mon Sep 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc5.10]
 - Merge ark-patches
 
diff --git a/sources b/sources
index 6954b8277..5b968bfa6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.9-rc5.tar.xz) = 1ba4095482ef95c0361e42ed2b73714840bd2a921218b96c87501f7606525ea686d2e0d53f57a3b90bf64f152b736b567e9bbb06125853e22e4ccbd8714cf491
-SHA512 (kernel-abi-whitelists-5.9.0-0.rc5.11.tar.bz2) = a33d6be72b0e48f51c84dcd7a7209f573f37d6b5f6396840f49c7806ba36d8bf417959b47844a87735d5a673ee3b95e7928ad9dfbc45b9224e77bebde1f8fb55
-SHA512 (kernel-kabi-dw-5.9.0-0.rc5.11.tar.bz2) = 86de7c37ac19afee982ee0f40a38f45e3162b9fbd1f0cfc97ad19e197a6429517febed9d0c3dae88e5cd1713c03d925c827fc9800e7bbfea5d832d13cac34d6d
+SHA512 (linux-20200916gitfc4f28bb3daf.tar.xz) = 412fbc9f8680caaa640c4c3032bb26a9264b9c48117d123afa0f2f7842344f52aa5a5b06c15714c7d59597596f252187fb911cc6884a1bf65638c146813af0cf
+SHA512 (kernel-abi-whitelists-5.9.0-0.rc5.20200916gitfc4f28bb3daf.12.tar.bz2) = b5c51a340626106b65abf1a667a19849f55b44e8acb874be43ee3e8eaa7424a70d69de62601f028ad9e143b7e594867e6e2bb2f060d435f6339202a565546bd4
+SHA512 (kernel-kabi-dw-5.9.0-0.rc5.20200916gitfc4f28bb3daf.12.tar.bz2) = af9d8c47e2332749de58a4693469231a9bc6273dadd5c85688c7a200c3c92ac35b12f1cc793deda39f66f8c5ba5cca1b68a6a24f97ce91eca3248c0d145d52be
-- 
cgit