rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-08-01 10:25:32 +03:00
parent 0db6e56857 064c1675a1
commit 8b7b73144a
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
18 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 26
RHEL_RELEASE = 30
#
# RHEL_REBASE_NUM

1
kernel-aarch64-64k-debug-rhel.config
View File

@ -474,6 +474,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-aarch64-64k-rhel.config
View File

@ -474,6 +474,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-aarch64-debug-rhel.config
View File

@ -471,6 +471,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-aarch64-rhel.config
View File

@ -471,6 +471,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-aarch64-rt-debug-rhel.config
View File

@ -478,6 +478,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-aarch64-rt-rhel.config
View File

@ -478,6 +478,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-ppc64le-debug-rhel.config
View File

@ -342,6 +342,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-ppc64le-rhel.config
View File

@ -342,6 +342,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-s390x-debug-rhel.config
View File

@ -341,6 +341,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-s390x-rhel.config
View File

@ -341,6 +341,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-x86_64-debug-rhel.config
View File

@ -367,6 +367,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-x86_64-rhel.config
View File

@ -367,6 +367,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-x86_64-rt-debug-rhel.config
View File

@ -375,6 +375,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

1
kernel-x86_64-rt-rhel.config
View File

@ -375,6 +375,7 @@ CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT=y
CONFIG_AUTOFS4_FS=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_B43 is not set

20
kernel.spec
View File

@ -174,13 +174,13 @@ Summary: The Linux kernel
%define specrpmversion 6.5.0
%define specversion 6.5.0
%define patchversion 6.5
%define pkgrelease 0.rc3.20230727git0a8db05b571a.26
%define pkgrelease 0.rc4.30
%define kversion 6
%define tarfile_release 6.5-rc3-44-g0a8db05b571a
%define tarfile_release 6.5-rc4
# This is needed to do merge window version magic
%define patchlevel 5
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20230727git0a8db05b571a.26%{?buildid}.0.riscv64%{?dist}
%define specrelease 0.rc4.30%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.5.0
@ -3753,9 +3753,21 @@ fi\
#
#
%changelog
* Fri Jul 28 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.5.0-0.rc3.0a8db05b571a.26.el127.0.riscv64]
* Tue Aug 01 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.5.0-0.rc4.30.el127.0.riscv64]
- Add support for riscv64
* Mon Jul 31 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc4.30.el127]
- Linux v6.5.0-0.rc4
* Sun Jul 30 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.d31e3792919e.29.el127]
- Linux v6.5.0-0.rc3.d31e3792919e
* Sat Jul 29 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.ffabf7c73176.28.el127]
- Linux v6.5.0-0.rc3.ffabf7c73176
* Fri Jul 28 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.57012c57536f.27.el127]
- Linux v6.5.0-0.rc3.57012c57536f
* Thu Jul 27 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.0a8db05b571a.26.el127]
- redhat/configs: Disable FIREWIRE for RHEL (Prarit Bhargava)
- Linux v6.5.0-0.rc3.0a8db05b571a

2
patch-6.5-redhat.patch
View File

@ -118,7 +118,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index 22e392649b02..e9e8ea292146 100644
index 653238528aac..f64aaa59e0e3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.5-rc3-44-g0a8db05b571a.tar.xz) = 10948a1621f38af92abb280ea2c68956eb80e873f70f1c820a5e307f3a0e159bc95fa4a92194be3ec90b2211016f469f3be61c007f27177527e29813f68b7567
SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 45990dadcefe75363a50c15d1acff75a4d730d77d53d28e7e7b17c13bd9688f5053af1fc0235666184946441c4249db5c103b9c6fb8d6dd3da42981f17e228ca
SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = cb583c41b782fc8562c83179e0250c76ecf314abe8aeec8c39c4fbc9a790cd6f8ed378faf4e8bf70051d301eb3eae623bc8dea45756ce101499c3f7611eca641
SHA512 (linux-6.5-rc4.tar.xz) = f6906a7e061ca4e3730364a41e1b5d36613c5776d4805cd747db2951608faac0cbc0f293e0d604ba2d640722b4b7e648bdcb6d8857eaeb399ae61ecce724fc00
SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 7a97d844f4804c5d60d0b2cbdb84b33d457f282dfcfc5834d8232952152ffa5a0ba7d5fae7f5a296e4a94ccbf5fe9247bcce1bb0752f6b2dfd133fe6d7f30c2e
SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 09b64598aff5bee85c1e9f83cb52d6f62006964447504a2dca6e28b65ba9df2c6cec227e9e804e5518a8b31c3ccc92cb13d7ad4f2a5f48b86414e165c4c2fb97