kernel-6.2.0-0.rc3.20230109git1fe4fd6f5cad.24
* Mon Jan 09 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.1fe4fd6f5cad.24] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
83f75290fd
commit
9c555bfbf8
26 changed files with 56 additions and 80 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue