Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora

1 files changed, 19 insertions, 7 deletions

diff --git a/kernel.spec b/kernel.spec
index 9e76322e3..8bffb2b63 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -78,9 +78,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
-%global distro_build 0.rc6.46
+%global distro_build 0.rc6.20210817git794c7931a242.47
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -126,13 +126,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 0.rc6.46
+%define pkgrelease 0.rc6.20210817git794c7931a242.47
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.46%{?buildid}%{?dist}
+%define specrelease 0.rc6.20210817git794c7931a242.47%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -673,7 +673,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc6.tar.xz
+Source0: linux-5.14-rc6-41-g794c7931a242.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1359,8 +1359,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14-rc6 -c
-mv linux-5.14-rc6 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc6-41-g794c7931a242 -c
+mv linux-5.14-rc6-41-g794c7931a242 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2958,6 +2958,18 @@ fi
 #
 #
 %changelog
+* Tue Aug 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210817git794c7931a242.47]
+- Revert "redhat: ark: disable CONFIG_NET_SCH_MULTIQ" (Marcelo Ricardo Leitner)
+- redhat: configs: Enable CONFIG_WIRELESS_HOTKEY (Hans de Goede)
+- redhat/configs: Update CONFIG_NVRAM (Desnes A. Nunes do Rosario) [1988254]
+- common: serial: build in SERIAL_8250_LPSS for x86 (Peter Robinson)
+- powerpc: enable CONFIG_FUNCTION_PROFILER (Diego Domingos) [1831065]
+- crypto: rng - Override drivers/char/random in FIPS mode (Herbert Xu)
+- random: Add hook to override device reads and getrandom(2) (Herbert Xu)
+- redhat/configs: Disable Soft-RoCE driver (Kamal Heib)
+- filter-modules.sh: add more sound modules to filter (Jaroslav Kysela)
+- redhat/configs: sound configuration cleanups and updates (Jaroslav Kysela)
+
 * Fri Aug 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.20210813gitf8e6dfc64f61.45]
 - update filters for Fedora (Justin M. Forbes)