diff options
Diffstat (limited to 'patch-6.2-redhat.patch')
| -rw-r--r-- | patch-6.2-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 3d51de1e8..be8f006de 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index c05b4fb7121e..3f787bf5207e 100644 +index 460716314fb3..7b76828602d2 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1296,7 +1296,7 @@ index 7be562a4e1aa..0169d9f5df9b 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 c03093b6813c..46a71df1fbd1 100644 +index fc39d01e7b63..a3d68d41be11 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) @@ -1332,7 +1332,7 @@ index c03093b6813c..46a71df1fbd1 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -903,8 +909,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -905,8 +911,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 */ |