diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-19 07:05:19 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-19 07:05:19 +0200 |
commit | 5e24b7da354d3e15954d6c12ec594f66bd7a1d42 (patch) | |
tree | 47554a573b4989fc51199072896504b5330340c1 /patch-5.15-redhat.patch | |
parent | b9009d4d2130dc503c74f39e66698702edc6c29a (diff) | |
parent | 9d0424b3fb5582d1f8d097b75c222be850225253 (diff) | |
download | kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.tar.gz kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.tar.xz kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc6.47.vanilla.1.fc36kernel-5.15.0-0.rc6.47.vanilla.1.fc35kernel-5.15.0-0.rc6.47.vanilla.1.fc34kernel-5.15.0-0.rc6.47.vanilla.1.fc33
Diffstat (limited to 'patch-5.15-redhat.patch')
-rw-r--r-- | patch-5.15-redhat.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index a49166367..8375ff322 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -141,7 +141,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 4d0c0ed9236e..ca36f5a601f0 100644 +index 91297670da8e..a94f22de77ad 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1573,7 +1573,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 7712a8f78337..471f4ff4272a 100644 +index f8dd664b2eda..0ff9ea8340e4 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -262,6 +262,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1640,7 +1640,7 @@ index 7712a8f78337..471f4ff4272a 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index e8ccdd398f78..b77de74d3660 100644 +index fba06618c6c2..a4d81de29e13 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1676,7 +1676,7 @@ index e8ccdd398f78..b77de74d3660 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) -@@ -816,8 +822,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -814,8 +820,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 */ |