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

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

Browse Source 
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-09-09 17:22:11 +03:00
commit 68b3e461c3
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
14 changed files with 64 additions and 33 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 = 49
RHEL_RELEASE = 56
#
# RHEL_REBASE_NUM

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

@ -4788,8 +4788,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

2
kernel-ppc64le-rhel.config
View File

@ -4767,8 +4767,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

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

@ -4720,8 +4720,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QDIO=m
CONFIG_QEDE=m
CONFIG_QED_FCOE=y

2
kernel-s390x-rhel.config
View File

@ -4699,8 +4699,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QDIO=m
CONFIG_QEDE=m
CONFIG_QED_FCOE=y

2
kernel-s390x-zfcpdump-rhel.config
View File

@ -4711,8 +4711,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QDIO=y
CONFIG_QEDE=m
CONFIG_QED_FCOE=y

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

@ -5008,8 +5008,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

2
kernel-x86_64-rhel.config
View File

@ -4986,8 +4986,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

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

@ -5052,8 +5052,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

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

@ -5030,8 +5030,6 @@ CONFIG_QCA83XX_PHY=m
# CONFIG_QCOM_SPM is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_QCOM_SSC_BLOCK_BUS is not set
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
CONFIG_QEDE=m
CONFIG_QED_FCOE=y
CONFIG_QEDF=m

28
kernel.changelog
View File

@ -1,3 +1,31 @@
* Mon Sep 09 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc7.56]
- Linux v6.11.0-0.rc7
Resolves:
* Sun Sep 08 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.d1f2d51b711a.55]
- Linux v6.11.0-0.rc6.d1f2d51b711a
Resolves:
* Sat Sep 07 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.b31c44928842.54]
- Linux v6.11.0-0.rc6.b31c44928842
Resolves:
* Fri Sep 06 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.b831f83e40a2.53]
- Linux v6.11.0-0.rc6.b831f83e40a2
Resolves:
* Thu Sep 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.c763c4339688.52]
- Linux v6.11.0-0.rc6.c763c4339688
Resolves:
* Wed Sep 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.88fac17500f4.51]
- Linux v6.11.0-0.rc6.88fac17500f4
Resolves:
* Mon Sep 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.67784a74e258.50]
- Linux v6.11.0-0.rc6.67784a74e258
Resolves:
* Sun Sep 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.49]
- Linux v6.11.0-0.rc6
Resolves:

29
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.11.0
%define specversion 6.11.0
%define patchversion 6.11
%define pkgrelease 0.rc6.49
%define pkgrelease 0.rc7.56
%define kversion 6
%define tarfile_release 6.11-rc6
%define tarfile_release 6.11-rc7
# This is needed to do merge window version magic
%define patchlevel 11
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc6.49%{?buildid}.0.riscv64%{?dist}
%define specrelease 0.rc7.56%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.11.0
@ -4123,9 +4123,30 @@ fi\
#
#
%changelog
* Mon Sep 02 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.0-0.rc6.49.0.riscv64]
* Mon Sep 09 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.0-0.rc7.56.0.riscv64]
- Add support for riscv64
* Mon Sep 09 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc7.56]
- Linux v6.11.0-0.rc7
* Sun Sep 08 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.d1f2d51b711a.55]
- Linux v6.11.0-0.rc6.d1f2d51b711a
* Sat Sep 07 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.b31c44928842.54]
- Linux v6.11.0-0.rc6.b31c44928842
* Fri Sep 06 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.b831f83e40a2.53]
- Linux v6.11.0-0.rc6.b831f83e40a2
* Thu Sep 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.c763c4339688.52]
- Linux v6.11.0-0.rc6.c763c4339688
* Wed Sep 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.88fac17500f4.51]
- Linux v6.11.0-0.rc6.88fac17500f4
* Mon Sep 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.67784a74e258.50]
- Linux v6.11.0-0.rc6.67784a74e258
* Sun Sep 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc6.49]
- Linux v6.11.0-0.rc6

14
patch-6.11-redhat.patch
View File

@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6
+
+endmenu
diff --git a/Makefile b/Makefile
index d57cfc6896b8..1dd324956fcd 100644
index 2966d5fbbf17..433b17f4a986 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -233,7 +233,7 @@ index d57cfc6896b8..1dd324956fcd 100644
ifdef mixed-build
# ===========================================================================
# We're called with mixed targets (*config and build targets).
@@ -1241,7 +1264,13 @@ define filechk_version.h
@@ -1242,7 +1265,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@ -248,7 +248,7 @@ index d57cfc6896b8..1dd324956fcd 100644
endef
$(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
@@ -1848,6 +1877,23 @@ endif
@@ -1849,6 +1878,23 @@ endif
ifdef CONFIG_MODULES
@ -273,7 +273,7 @@ index d57cfc6896b8..1dd324956fcd 100644
@:
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 54b2bb817a7f..0415b853e1af 100644
index 173159e93c99..5074a7e9f9b8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1227,9 +1227,9 @@ config HIGHMEM
@ -1990,7 +1990,7 @@ index a00671b58701..eeef2766b8b3 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 0dc8bcc664f2..6c524e09b0d5 100644
index 983909a600ad..28e59054b7c6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -262,6 +262,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -2060,7 +2060,7 @@ index 0dc8bcc664f2..6c524e09b0d5 100644
#ifdef CONFIG_NVME_HOST_AUTH
queue_work(nvme_wq, &ctrl->dhchap_auth_work);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 91d9eb3c22ef..d44cdba1ffea 100644
index 518e22dd4f9b..af7d1591e9c6 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@ -2096,7 +2096,7 @@ index 91d9eb3c22ef..d44cdba1ffea 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
@@ -998,8 +1004,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
@@ -1000,8 +1006,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
int error = 0;
/* check if multipath is enabled and we have the capability */

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.11-rc6.tar.xz) = 29b74d86d56a2122a89718a6f8a05dd67f353e15b5d653a2dc0b87e64e452037223e5e8b35869f17e58feaa63bd4411847a4e97b97245b427d3000fc0b8f76d5
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f530626b358c18784c9c4aeb301592196a70f128fb62184f63a0757238e808c83bbfd49a88c58a5c148bbeaef1cbcbf78ccc1aa11b80bc752a7da271a2ca995c
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 054d94f9dfbfc5eaa2d68ad1be50872e2e2db84a34c5a199f8e6b584488c0797eb767674fcc4ec049440c00572337f76647de3e2901a150417ecee2dbdb92ffb
SHA512 (linux-6.11-rc7.tar.xz) = 6d0afb7b215e6eca33aac0dc7a2ca7720daa6f2699503c9017344b0d58d3b5341d17eb41bffbabffba3f824d9f86a224db7f2b99c3f5de93a4cbe588a9074ad4
SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d62c00e84ec79616c0d4071cfe6f62c81bc2f6cfca90e6d1def851471b0862b54c842193cfdae272e737faeb8c21d5106e78da719655ac2629b84f6405e02c25
SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 7066713fe4fa326f84189ee588808fab4b34855bef653f67948c86310f509bf08c7c2d87cf930fb0107b865b56ef8f3257d50c5c057c52a657a2a146ea13a325