summaryrefslogtreecommitdiffstats
path: root/patch-5.15-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-09-20 13:53:29 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-09-20 13:53:29 -0500
commit55df632eeefe70708d43252d76cdb8e61d7f7072 (patch)
treedd777e885bb725d5e1dfc7440724c6b26feee4e0 /patch-5.15-redhat.patch
parent4a6ac59992e3ace904ad35142e5685d7fbcebc46 (diff)
downloadkernel-55df632eeefe70708d43252d76cdb8e61d7f7072.tar.gz
kernel-55df632eeefe70708d43252d76cdb8e61d7f7072.tar.xz
kernel-55df632eeefe70708d43252d76cdb8e61d7f7072.zip
kernel-5.15-0.rc1.20210918git4357f03d6611.16
* Sat Sep 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210918git4357f03d6611.16] - redhat: bump RHEL_MAJOR and add the changelog file for it (Herton R. Krzesinski) - redhat: add documentation about the os-build rebase process (Herton R. Krzesinski) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.15-redhat.patch')
-rw-r--r--patch-5.15-redhat.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 06b913976..98a723329 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 34a0afc3a8eb..621ea3c850a9 100644
+index 5e7c1d854441..f2d34de5aa2b 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 7efb31b87f37..c9eeeb9eca52 100644
+index 6600e138945e..4c601ede2509 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -263,6 +263,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1640,7 +1640,7 @@ index 7efb31b87f37..c9eeeb9eca52 100644
}
EXPORT_SYMBOL_GPL(nvme_complete_rq);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 5d7bc58a27bd..2f484c95a72e 100644
+index e8ccdd398f78..b77de74d3660 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 5d7bc58a27bd..2f484c95a72e 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next)
-@@ -813,8 +819,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -816,8 +822,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 */
@@ -1756,7 +1756,7 @@ index 2761ab86490d..aa71a0c904f3 100644
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index e5089af8ad90..01dd08860d4e 100644
+index 4537d1ea14fd..af30ab6c81e2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4268,6 +4268,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,