From ee92ee03d2ea0f298f5c31b1e4892c0ea9b0d041 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 22 May 2023 08:32:19 -0500 Subject: [PATCH] kernel-6.4.0-0.rc3.28 * Mon May 22 2023 Fedora Kernel Team [6.4.0-0.rc3.28] - Enable CONFIG_BT on aarch64 (Charles Mirabile) - Linux v6.4.0-0.rc3 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel.spec | 16 +++++++++++++--- patch-6.4-redhat.patch | 18 +++++++++--------- sources | 6 +++--- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 96c4e2660..ae6229694 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 25 +RHEL_RELEASE = 28 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 87d881e76..32f54f472 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -702,10 +702,10 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m # CONFIG_BT_HS is not set CONFIG_BT_INTEL=m -# CONFIG_BT is not set # CONFIG_BT_LEDS is not set CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_LE=y +CONFIG_BT=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m # CONFIG_BT_MSFTEXT is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 254d0fa1f..68767a3b3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -702,10 +702,10 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m # CONFIG_BT_HS is not set CONFIG_BT_INTEL=m -# CONFIG_BT is not set # CONFIG_BT_LEDS is not set CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_LE=y +CONFIG_BT=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m # CONFIG_BT_MSFTEXT is not set diff --git a/kernel.spec b/kernel.spec index 507d1b4ab..053066ae6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -148,13 +148,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc2.20230519git2d1bcbc6cd70.25 +%define pkgrelease 0.rc3.28 %define kversion 6 -%define tarfile_release 6.4-rc2-163-g2d1bcbc6cd70 +%define tarfile_release 6.4-rc3 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20230519git2d1bcbc6cd70.25%{?buildid}%{?dist} +%define specrelease 0.rc3.28%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3415,6 +3415,16 @@ fi # # %changelog +* Mon May 22 2023 Fedora Kernel Team [6.4.0-0.rc3.28] +- Enable CONFIG_BT on aarch64 (Charles Mirabile) +- Linux v6.4.0-0.rc3 + +* Sun May 21 2023 Fedora Kernel Team [6.4.0-0.rc2.0dd2a6fb1e34.27] +- Linux v6.4.0-0.rc2.0dd2a6fb1e34 + +* Sat May 20 2023 Fedora Kernel Team [6.4.0-0.rc2.d3f704310cc7.26] +- Linux v6.4.0-0.rc2.d3f704310cc7 + * Fri May 19 2023 Fedora Kernel Team [6.4.0-0.rc2.2d1bcbc6cd70.25] - redhat/configs: turn on CONFIG_MARVELL_CN10K_TAD_PMU (Michal Schmidt) [2042240] - redhat/configs: Fix enabling MANA Infiniband (Kamal Heib) diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index 6d39c4fbb..90f252d03 100644 --- a/patch-6.4-redhat.patch +++ b/patch-6.4-redhat.patch @@ -117,7 +117,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f836936fb4d8..0e546f04deab 100644 +index 3cd9bc2886d6..ecdf61d5ea9f 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -205,10 +205,10 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 43de939b7af1..30055c481555 100644 +index f44f70de9661..829255d50d01 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c -@@ -2518,3 +2518,8 @@ int ipl_report_free(struct ipl_report *report) +@@ -2517,3 +2517,8 @@ int ipl_report_free(struct ipl_report *report) } #endif @@ -1218,7 +1218,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index ccb6eb1282f8..6b96e7224bd3 100644 +index 1f0cbb77b249..0a80d662466c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -251,6 +251,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1285,7 +1285,7 @@ index ccb6eb1282f8..6b96e7224bd3 100644 #ifdef CONFIG_NVME_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 9171452e2f6d..289bbb3523ce 100644 +index 2bc159a318ff..d5562a97f232 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -1321,7 +1321,7 @@ index 9171452e2f6d..289bbb3523ce 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -905,8 +911,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -904,8 +910,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 */ @@ -1332,10 +1332,10 @@ index 9171452e2f6d..289bbb3523ce 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index bf46f122e9e1..06dd6bc08962 100644 +index a2d4f59e0535..1c5092b995e9 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -878,6 +878,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1343,7 +1343,7 @@ index bf46f122e9e1..06dd6bc08962 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -911,6 +912,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -916,6 +917,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } diff --git a/sources b/sources index f1daf259e..1f69ae9de 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc2-163-g2d1bcbc6cd70.tar.xz) = 8a731252e7cda7fd7f38b33cdef9de5df7b3420b7503b9d8745fcc3e25080a1a9d257fd028139f5ece2cbf234f9b9949b4c414951812024e5dde34289e7eb677 -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = f56bafeb7c09e0fcaac0d49fec708ba90882f08a0420b146d3f4a6c995c67f8bfbfde42e42b60d34f68f9562571899291bf2326429bbf86483959b56f4c5dcf7 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = c26e0955231218bd2a482893a6d4913b6176afe55b04554ce59b7e524d063fb5e31a57a8d3c7ae8062a344ef83b8f1f49b6828340fe035efd6721a8a0d5356fa +SHA512 (linux-6.4-rc3.tar.xz) = 56901e884f631a207d05ef6fbc5827558d6283a21b42d07da91994afaa3b1b4b22713239529931a36758bdc4a0986e6930eaf7507ee4415da96dcb44536afa34 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 884c7f01e2337c2e263d1f5543f32546ad3554335a7a3d5a3ba98f7c33c54d3cdb4254db2f0675ec27a520f4a48cc2c4f50cc0d6e71743e0fbf4ff37914a0315 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = a162bcefee0970e1c92e267ebe0f6c99e42adff069f2f6591617ffcfd0b0757bd708f15df93cc54cd498cb043be4cd7b11583efc3659cebc452e46c8d3551e5b