Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-08-24 11:22:50 +03:00
commit e7cdc34c2e
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
4 changed files with 20 additions and 10 deletions

View File

@ -1,3 +1,6 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/3646d21c389ec7834fc09907787bf597342b7678
3646d21c389ec7834fc09907787bf597342b7678 ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop
"https://gitlab.com/cki-project/kernel-ark/-/commit"/1004737240e720078d4c57351d055e516b648305
1004737240e720078d4c57351d055e516b648305 Revert "KVM: SEV: remove ghcb variable declarations"

View File

@ -171,18 +171,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
%define specrpmversion 6.4.11
%define specversion 6.4.11
%define specrpmversion 6.4.12
%define specversion 6.4.12
%define patchversion 6.4
%define pkgrelease 200
%define kversion 6
%define tarfile_release 6.4.11
%define tarfile_release 6.4.12
# This is needed to do merge window version magic
%define patchlevel 4
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 200%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.4.11
%define kabiversion 6.4.12
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -3376,7 +3376,9 @@ rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" ]]; then\
ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.%compext" "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext"\
command -v restorecon &>/dev/null && restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" \
if command -v restorecon &>/dev/null; then\
restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext"\
fi\
fi\
%{nil}
@ -3828,9 +3830,14 @@ fi\
#
#
%changelog
* Thu Aug 17 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.11-0.0.riscv64]
* Thu Aug 22 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.12-0.0.riscv64]
- Add support for riscv64
* Wed Aug 23 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.4.12-0]
- ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop (Ranjani Sridharan)
- Make sure posttrans script doesn't fail if restorecon is not installed (Daan De Meyer)
- Linux v6.4.12
* Wed Aug 16 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.4.11-0]
- Add more bugfixes for 6.4.11 (Justin M. Forbes)
- Turn off DMABUF_SYSFS_STATS (Justin M. Forbes)

View File

@ -40,7 +40,7 @@
39 files changed, 518 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile
index d0efd84bb7d0..77fb7e58f9eb 100644
index 0ff13b943f99..a0066c563e57 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.4.11.tar.xz) = ca3456dd1339849ab12381dc0bd3b5f3a7c88824f38837b064602487e1b0880d8a55c665b254426fc2bfc1a5a513f7a4d767eec333d9c1c214d92bb6f7701813
SHA512 (kernel-abi-stablelists-6.4.11.tar.bz2) = 60b1ba8a5aba1d774302da430f5c9569cf0b45018baf29ecc40286ce743ab32cb4e4c6810beb9cba765fae5be0f2bbf2f4e9615bb0ecf8990f05bc1baf6db150
SHA512 (kernel-kabi-dw-6.4.11.tar.bz2) = a711780dcd1677736e03358ef2efd160fe11e9280851d221e75ae62d09cae4dad68f4b590437be95a51e0d65e75c50f331a72cd4edaafda8d596cb90277b5f9c
SHA512 (linux-6.4.12.tar.xz) = 72103180001e77f4b506d43ab2118c3d1a1bfbb3d0d3f7903dba9f1cd0491612af85cec88c87566cecfafb3035ad57e7c993a9b88833928cf3c177b41b0db26e
SHA512 (kernel-abi-stablelists-6.4.12.tar.bz2) = 7cd5f83ef8782e8c564a7276102654b12edeace0e26bd40799f1ddd9feb1319799f0b6678caf7910791527ff0b75719bc42ed9d4bca85ada19a6b35649328203
SHA512 (kernel-kabi-dw-6.4.12.tar.bz2) = 08b7a0cc6c81eaaf3173d91007df26eba07cb81d0a3529cf84ba54e5c7ee856878d08aa415a07aceafc3848fa52ba1e3a4dadbaaccd8b746a59c1208f1192dba