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

1 files changed, 15 insertions, 8 deletions

diff --git a/kernel.spec b/kernel.spec
index 394c7f990..750807078 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.rc0.20200813gitdc06fe51d26e.1
+%global distro_build 0.rc1.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -71,13 +71,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.9.0
-%define pkgrelease 0.rc0.20200813gitdc06fe51d26e.1
+%define pkgrelease 0.rc1.1
 
 # This is needed to do merge window version magic
 %define patchlevel 9
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20200813gitdc06fe51d26e.1%{?buildid}%{?dist}
+%define specrelease 0.rc1.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200813gitdc06fe51d26e.tar.xz
+Source0: linux-5.9-rc1.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1285,8 +1285,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200813gitdc06fe51d26e -c
-mv linux-20200813gitdc06fe51d26e linux-%{KVERREL}
+%setup -q -n kernel-5.9-rc1 -c
+mv linux-5.9-rc1 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2798,15 +2798,22 @@ fi
 #
 #
 %changelog
-* Thu Aug 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc0.20200813gitdc06fe51d26e.1]
-- dc06fe51d26e rebase
+* Mon Aug 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.1]
+- v5.9-rc1 rebase
+- Config updates for Fedora ("Justin M. Forbes")
+- fedora: enable enery model (Peter Robinson)
+- iio: enable LTR-559 light and proximity sensor (Peter Robinson)
+- iio: chemical: enable some popular chemical and partical sensors (Peter Robinson)
 - More mismatches ("Justin M. Forbes")
 - Fedora config change due to deps ("Justin M. Forbes")
 - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes")
 - Config change required for build part 2 ("Justin M. Forbes")
 - Config change required for build ("Justin M. Forbes")
+- Enable ARM_SMCCC_SOC_ID on all aarch64 kernels (Peter Robinson)
+- Enable ZSTD compression algorithm on all kernels (Peter Robinson)
 - Fedora config update ("Justin M. Forbes")
 - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes)
+- Use the configs/generic config for SND_HDA_INTEL everywhere (Peter Robinson)
 - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava)
 - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava)
 - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava)