Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc6.90.vanilla.1.fc34kernel-5.10.0-0.rc6.90.vanilla.1.fc33kernel-5.10.0-0.rc6.90.vanilla.1.fc32kernel-5.10.0-0.rc6.90.vanilla.1.fc31

1 files changed, 33 insertions, 7 deletions

diff --git a/kernel.spec b/kernel.spec
index 2c41a5ff7..dbaa06d01 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.rc5.20201125git127c501a03d5.85
+%global distro_build 0.rc6.90
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -99,13 +99,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.10.0
-%define pkgrelease 0.rc5.20201125git127c501a03d5.85
+%define pkgrelease 0.rc6.90
 
 # This is needed to do merge window version magic
 %define patchlevel 10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20201125git127c501a03d5.85%{?buildid}%{?dist}
+%define specrelease 0.rc6.90%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -505,7 +505,9 @@ BuildRequires: kmod, patch, bash, tar, git-core
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
 BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
 BuildRequires: net-tools, hostname, bc, elfutils-devel
+%if 0%{?fedora}
 BuildRequires: dwarves
+%endif
 BuildRequires: python3-devel
 %if %{with_headers}
 BuildRequires: rsync
@@ -594,7 +596,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20201125git127c501a03d5.tar.xz
+Source0: linux-5.10-rc6.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1238,8 +1240,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20201125git127c501a03d5 -c
-mv linux-20201125git127c501a03d5 linux-%{KVERREL}
+%setup -q -n kernel-5.10-rc6 -c
+mv linux-5.10-rc6 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2681,8 +2683,32 @@ fi
 #
 #
 %changelog
-* Wed Nov 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201125git127c501a03d5.85]
+* Mon Nov 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc6.90]
 - Temporarily backout parallel xz script ("Justin M. Forbes")
+- build_configs.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- genspec.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- ark-rebase-patches.sh: Fix for shellcheck (Ben Crocker)
+- ark-create-release.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- merge-subtrees.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- rh-dist-git.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- update_scripts.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- x86_rngd.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- parallel_xz.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- expand_srpm.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- create-tarball.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- generate_bls_conf.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- clone_tree.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- new_release.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- download_cross.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- create_distgit_changelog.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- generate_cross_report.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- run_kabi-dw.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- mod-blacklist.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- scripts/configdiff.sh: Fix syntax flagged by shellcheck (Ben Crocker)
+- self-test/0001-shellcheck.bats: check for shellcheck (Ben Crocker)
+- self-test/1001-rpmlint.bats, 1003-rpminspect.bats (Ben Crocker)
+- Makefile, Makefile.common, egit.sh, 1005-dist-dump-variables.bats (Ben Crocker)
+- Add GIT macro to Makefile and Makefile.common: (Ben Crocker)
 
 * Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
 - Fedora config update ("Justin M. Forbes")