From cc9d1aabf0c139c531b0d301bfbfb39d9dd5d7d2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Sep 2021 13:50:49 -0500 Subject: kernel-5.15-0.rc1.12 * Mon Sep 13 2021 Fedora Kernel Team [5.15-0.rc1.12] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.15-redhat.patch | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'patch-5.15-redhat.patch') diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 02b5f6d33..546707328 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 2d1e491f7737..b056845109e5 100644 +index 7cfe4ff36f44..eab999eeb925 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -581,10 +581,10 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index b24513ec3fae..8308569f66e0 100644 +index 5b54c80b9d32..86c314f8d8a0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1721,6 +1721,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1720,6 +1720,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; @@ -1573,10 +1573,10 @@ index 75dbe77b0b4b..029ff8576f8e 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 8679a108f571..0875e3578088 100644 +index 7efb31b87f37..c9eeeb9eca52 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -261,6 +261,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -263,6 +263,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1586,7 +1586,7 @@ index 8679a108f571..0875e3578088 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -320,6 +323,7 @@ enum nvme_disposition { +@@ -322,6 +325,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1594,7 +1594,7 @@ index 8679a108f571..0875e3578088 100644 }; static inline enum nvme_disposition nvme_decide_disposition(struct request *req) -@@ -327,15 +331,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -329,15 +333,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if (likely(nvme_req(req)->status == 0)) return COMPLETE; @@ -1614,7 +1614,7 @@ index 8679a108f571..0875e3578088 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -357,6 +362,14 @@ static inline void nvme_end_req(struct request *req) +@@ -359,6 +364,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1629,7 +1629,7 @@ index 8679a108f571..0875e3578088 100644 void nvme_complete_rq(struct request *req) { trace_nvme_complete_rq(req); -@@ -375,6 +388,9 @@ void nvme_complete_rq(struct request *req) +@@ -377,6 +390,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1640,7 +1640,7 @@ index 8679a108f571..0875e3578088 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 37ce3e8b1db2..00a3e40026cf 100644 +index 5d7bc58a27bd..2f484c95a72e 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 37ce3e8b1db2..00a3e40026cf 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) -@@ -796,8 +802,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -813,8 +819,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 */ @@ -1687,10 +1687,10 @@ index 37ce3e8b1db2..00a3e40026cf 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index a2e1f298b217..87fb7efca59b 100644 +index 9871c0c9374c..08afeca5ffda 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -739,6 +739,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -740,6 +740,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags); void nvme_failover_req(struct request *req); @@ -1698,7 +1698,7 @@ index a2e1f298b217..87fb7efca59b 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -776,6 +777,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -778,6 +779,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } -- cgit