Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitf359287765c0.1.vanilla.1.fc31

3 files changed, 11 insertions, 11 deletions

diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 582bcf04d..fc015795c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5128,7 +5128,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_AMD_ENERGY=m
+# CONFIG_SENSORS_AMD_ENERGY is not set
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5851,7 +5851,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM=y
 # CONFIG_SPEAKUP is not set
 # CONFIG_SPI_ALTERA is not set
-CONFIG_SPI_AMD=m
+# CONFIG_SPI_AMD is not set
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
diff --git a/kernel.spec b/kernel.spec
index 3162c2302..32735abb8 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.20200602gitf359287765c0.1
+%global distro_build 0.rc0.20200603gitf359287765c0.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -71,10 +71,10 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.8.0
-%define pkgrelease 0.rc0.20200602gitf359287765c0.1
+%define pkgrelease 0.rc0.20200603gitf359287765c0.1
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20200602gitf359287765c0.1%{?buildid}%{?dist}
+%define specrelease 0.rc0.20200603gitf359287765c0.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -566,7 +566,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200602gitf359287765c0.tar.xz
+Source0: linux-20200603gitf359287765c0.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1304,8 +1304,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200602gitf359287765c0 -c
-mv linux-20200602gitf359287765c0 linux-%{KVERREL}
+%setup -q -n kernel-20200603gitf359287765c0 -c
+mv linux-20200603gitf359287765c0 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
diff --git a/sources b/sources
index a4b73b01b..889f6ee16 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200602gitf359287765c0.tar.xz) = 4dafcc84914459b8596b43b950f4a88e5595a2f06c0a9c7a144e48fdc044f29a35c67f03c708d086207dbadf2fc446f028cd7a570ead3dd6e19c0a8a41fce4d5
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc0.20200602gitf359287765c0.1.tar.bz2) = 62bda398143cffe45cabf9a1f773d3d8d6464c7b84c0d294379ae7021b3c23e7a42583627dd58152073905025434560391eeeeac8739cb1a56ad902888dd1e8f
-SHA512 (kernel-kabi-dw-5.8.0-0.rc0.20200602gitf359287765c0.1.tar.bz2) = f61ef47dc1785be204269dec7c37f11bb091e20c641a22b45e4714f7f69e97c1fb12084859ea1e24197205a52290233dd67dcd553e4fca72a27df082f45f03af
+SHA512 (linux-20200603gitf359287765c0.tar.xz) = 316ad1162ecbf5cbe8df8f228f95aef2712bb105b6f963b371fde1c544fa564544a49e8f1674ce5e23a966bbcb602cbe998a1a5196fa779d08c8681d2269047c
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc0.20200603gitf359287765c0.1.tar.bz2) = aea552394c988877ad013530489815482dee6c73c253c1dfc92356f0721def709d87f86337ac79f99d31ef761128a5545820575dc129b2fdf283818825d9cc32
+SHA512 (kernel-kabi-dw-5.8.0-0.rc0.20200603gitf359287765c0.1.tar.bz2) = 86527d03093b374695372d816a7a01fe7f97b98afdeb480bc24d7a026b75cae8242e568d1fa7691cfe9a2de23a2431f91c578a841b095067f582bf3d78fd7cf4