From 8fe9790f2fbdd7cc3982bd8911bd0cbd0c1523fa Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Nov 2023 09:14:55 -0500 Subject: [PATCH] kernel-6.7.0-0.rc1.16 * Mon Nov 13 2023 Fedora Kernel Team [6.7.0-0.rc1.16] - Linux v6.7.0-0.rc1 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.spec | 16 +++++++++++++--- patch-6.7-redhat.patch | 16 ++++++++-------- sources | 6 +++--- 29 files changed, 50 insertions(+), 40 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1805083e6..3943824d4 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 = 13 +RHEL_RELEASE = 16 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 1295d3e60..2c94e384a 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -5439,7 +5439,7 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set CONFIG_NVME_APPLE=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 525bed700..8776a3931 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -5413,7 +5413,7 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set CONFIG_NVME_APPLE=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index d5b548058..9771e3505 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -4476,7 +4476,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 39e1d8223..5f6246825 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -4455,7 +4455,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index fd8f08260..bd00eda4e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5439,7 +5439,7 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set CONFIG_NVME_APPLE=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index edda9bd15..fccffe481 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4472,7 +4472,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 144a84e27..e1b78c848 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5413,7 +5413,7 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set CONFIG_NVME_APPLE=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 173d51341..f3bde7473 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4451,7 +4451,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 6ac7278e9..92cb4dfc3 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -4517,7 +4517,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 1dc60b8e5..43af8bdf6 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -4496,7 +4496,7 @@ CONFIG_NVDIMM_PFN=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 712c66dde..958fdced9 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4634,7 +4634,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index acb2af08f..c57f6876a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4124,7 +4124,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 58cf70b27..d2fb86321 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4606,7 +4606,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 9c229a9a0..7ebdb1852 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4104,7 +4104,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1a21568fe..dfb5edcff 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4602,7 +4602,7 @@ CONFIG_NUMA=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 4d4960d12..43b23880f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4107,7 +4107,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ca32ddb83..0447b96ae 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4574,7 +4574,7 @@ CONFIG_NUMA=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 710f79cd4..2647f173a 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4087,7 +4087,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 60f1f6e39..6daf0b1cd 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4099,7 +4099,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m # CONFIG_NVME_FC is not set # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 0f6bd53db..51d2faac8 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4978,7 +4978,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 721491285..439048226 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4320,7 +4320,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 88c327208..8c9e3e1a1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4952,7 +4952,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_SHIELD_FF=y CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_HWMON=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 65bd1e075..ef1f5a635 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4300,7 +4300,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 8d3c73251..ef8f2a00c 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4365,7 +4365,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 88d61fd54..bfaef3ba5 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4345,7 +4345,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m # CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set diff --git a/kernel.spec b/kernel.spec index 8fb637f1e..8cf3451d8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc0.20231110git89cdf9d55601.13 +%define pkgrelease 0.rc1.16 %define kversion 6 -%define tarfile_release 6.6-15859-g89cdf9d55601 +%define tarfile_release 6.7-rc1 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20231110git89cdf9d55601.13%{?buildid}%{?dist} +%define specrelease 0.rc1.16%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3709,6 +3709,16 @@ fi\ # # %changelog +* Mon Nov 13 2023 Fedora Kernel Team [6.7.0-0.rc1.16] +- Linux v6.7.0-0.rc1 + +* Sun Nov 12 2023 Fedora Kernel Team [6.7.0-0.rc0.1b907d050735.15] +- Linux v6.7.0-0.rc0.1b907d050735 + +* Sat Nov 11 2023 Fedora Kernel Team [6.7.0-0.rc0.3ca112b71f35.14] +- Flip CONFIG_NVME_AUTH to m in pending (Justin M. Forbes) +- Linux v6.7.0-0.rc0.3ca112b71f35 + * Fri Nov 10 2023 Fedora Kernel Team [6.7.0-0.rc0.89cdf9d55601.13] - Linux v6.7.0-0.rc0.89cdf9d55601 diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 90f7d2654..b8c22812a 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -125,7 +125,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index a82587fbdad3..9c5035159d37 100644 +index ede0bd241056..c5fc72ae0c20 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1671,10 +1671,10 @@ 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 62612f87aafa..66a4abbf0275 100644 +index 88b54cdcbd68..8c304a6bb55d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -252,6 +252,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1684,7 +1684,7 @@ index 62612f87aafa..66a4abbf0275 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -342,6 +345,7 @@ enum nvme_disposition { +@@ -341,6 +344,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1692,7 +1692,7 @@ index 62612f87aafa..66a4abbf0275 100644 AUTHENTICATE, }; -@@ -353,15 +357,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -352,15 +356,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED) return AUTHENTICATE; @@ -1712,7 +1712,7 @@ index 62612f87aafa..66a4abbf0275 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -391,6 +396,14 @@ static inline void nvme_end_req(struct request *req) +@@ -390,6 +395,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1727,7 +1727,7 @@ index 62612f87aafa..66a4abbf0275 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -420,6 +433,9 @@ void nvme_complete_rq(struct request *req) +@@ -419,6 +432,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -2284,7 +2284,7 @@ index d9ad21058eed..4424db2f92f5 100644 + #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 99b8176c3738..baaeb78a2bd2 100644 +index ff217a5ce552..90c924a7fa88 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -405,6 +405,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) diff --git a/sources b/sources index ee9c773f8..6625224ef 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.6-15859-g89cdf9d55601.tar.xz) = da35da48871c0c0daf8c057ea6d45dc51f6b10f345bd5c33ac32ba5f90e712a4126b10c71519b29feec52435e2d6cfae1bc287464aa56dbb0b5a5029cc6a1ea7 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = d6d565ccc6eb03067b9a25abd39f8dbddba8de04c8fead551bef684bacd550f978c6ba5f9923795388d8dc58b7edeb05a7b4f48b1bcc7c246f26b1af26d47fae -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 9561c16ed1b3ee89c21d6700acb971bf88d0122e0c8ea5f8fb77814c4e8ab7a3ea9e47b556cd89d37517f62fb3523eef947fa828887e5c222a624a33e32cc2ad +SHA512 (linux-6.7-rc1.tar.xz) = 251db90467005b7156cc95e50a41287bf84ba9867a69643e7d5e54fc335aa23f23c0c88272587e391fc9206e671e7a462871037ba1d1d258aaf35a2fcac0c5d3 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = d349d1bd09bc379da1c96956032f3653a73439497959c8e315919736778482be5dd76c16a1d3f8b17d0c83cf5e8a09300e4cefdc36643a407636697c2e90eea2 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 14eab9a2d5be372ce637f4a5c1236c5f78343020c972cae0a5624ab38479bd37e8afc82753eba5ff4ef1d7cd32642bd4bf299973f95aa36f0daa2d0d524905b4