summaryrefslogtreecommitdiffstats
path: root/patch-6.1-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-14 09:50:22 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-14 09:50:22 -0500
commitec39482fad6babae562a01b46fa2f878f1e0c935 (patch)
tree3f99750fc2c6c1c8147e2a05ea889ed27e5e0507 /patch-6.1-redhat.patch
parent700cee81d0577b9bf840b1292d228a95950182bd (diff)
downloadkernel-ec39482fad6babae562a01b46fa2f878f1e0c935.tar.gz
kernel-ec39482fad6babae562a01b46fa2f878f1e0c935.tar.xz
kernel-ec39482fad6babae562a01b46fa2f878f1e0c935.zip
kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11
* Fri Oct 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.9c9155a3509a.11] - Add kasan_test to mod-internal.list (Justin M. Forbes) - redhat/Makefile.variables: Fix typo with RHDISTGIT_TMP (Prarit Bhargava) - spec: fix path to `installing_core` stamp file for subpackages (Jonathan Lebon) - Remove unused ci scripts (Don Zickus) - Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs (Justin M. Forbes) - redhat: Add new fortify_kunit & is_signed_type_kunit to mod-internal.list (Patrick Talbert) - Linux v6.1.0-0.rc0.9c9155a3509a Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r--patch-6.1-redhat.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 41dc29584..a4cbc0aea 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -1293,7 +1293,7 @@ index 059737c1a2c1..3de14ca20059 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 00f2f81e20fa..082c2b3ed0f5 100644
+index 0ea7e441e080..bbd4ee0cbf05 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)
@@ -1329,7 +1329,7 @@ index 00f2f81e20fa..082c2b3ed0f5 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -872,8 +878,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -873,8 +879,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 */