FAILED: patch "[PATCH] media: Revert "media: rkisp1: Drop IRQF_SHARED"" failed to apply to 5.15-stable tree

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x a107d643b2a3382e0a2d2c4ef08bf8c6bff4561d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024021956-boxy-ethically-dcb0@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

a107d643b2a3 ("media: Revert "media: rkisp1: Drop IRQF_SHARED"") 0753874617de ("media: rkisp1: Store IRQ lines")
85d2a31fe4d9 ("media: rkisp1: Drop IRQF_SHARED")
0c0b9f9c8e84 ("media: rkisp1: csi: Rename CSI functions with a common rkisp1_csi prefix") 039a73427bfa ("media: rkisp1: csi: Handle CSI-2 RX configuration fully in rkisp1-csi.c") 4fd1e6a9abb3 ("media: rkisp1: isp: Start CSI-2 receiver before ISP") 8082e2f4994d ("media: rkisp1: Split CSI handling to separate file") af2dababb4d6 ("media: rkisp1: Reject sensors without pixel rate control at bound time") deaf1120ab96 ("media: rkisp1: Move sensor .s_stream() call to ISP") 0f3c2ab2a6da ("media: rkisp1: Make rkisp1_isp_mbus_info common") 1195b18c6486 ("media: rkisp1: Access ISP version from info pointer") 9125aee770fc ("media: rkisp1: Save info pointer in rkisp1_device") cdce5b957d5e ("media: rkisp1: Rename rkisp1_match_data to rkisp1_info") 196179c54572 ("media: rkisp1: Read the ID register at probe time instead of streamon") fd83ef8f8e59 ("media: rkisp1: Drop parentheses and fix indentation in rkisp1_probe()") fd3608fe6bfe ("media: rkisp1: Compile debugfs support conditionally") 8682037db36c ("media: rkisp1: Move debugfs code to a separate file") 0ef7dc305bd4 ("media: rkisp1: Swap value and address arguments to rkisp1_write()") 3b430c2cf0e4 ("media: rkisp1: regs: Rename CCL, ICCL and IRCL registers with VI_ prefix") 6ff02276beb9 ("media: rkisp1: Simplify rkisp1_entities_register() error path")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a107d643b2a3382e0a2d2c4ef08bf8c6bff4561d Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <[email protected]>
Date: Mon, 18 Dec 2023 08:54:00 +0100
Subject: [PATCH] media: Revert "media: rkisp1: Drop IRQF_SHARED"

This reverts commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74.

The rkisp1 does share interrupt lines on some platforms, after all. Thus we need to revert this, and implement a fix for the rkisp1 shared irq handling in a follow-up patch.

index f96f821a7b50..acc559652d6e 100644
@@ -559,7 +559,7 @@ static int rkisp1_probe(struct platform_device *pdev)
 				rkisp1->irqs[il] = irq;
 		}
 
-		ret = devm_request_irq(dev, irq, info->isrs[i].isr, 0,
+		ret = devm_request_irq(dev, irq, info->isrs[i].isr, IRQF_SHARED,
 				       dev_driver_string(dev), dev);
 		if (ret) {
 			dev_err(dev, "request irq failed: %d\n", ret);