diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
commit | 4b3848972b6fbc0e0325d77e7b14174c52fd5a00 (patch) | |
tree | 69344e95fce778ed61123da0bab49ae7d56353d5 /patch-6.1-redhat.patch | |
parent | 92b20db5d70b522842cb6d47e3eba89552a05c12 (diff) | |
parent | ec39482fad6babae562a01b46fa2f878f1e0c935 (diff) | |
download | kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.gz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.xz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc38kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc37kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc36kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc35
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r-- | patch-6.1-redhat.patch | 4 |
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 */ |