On Mon, Jun 26, 2023 at 12:25:16PM +0300, Sergey Shtylyov wrote:
On 6/26/23 7:33 AM, Sasha Levin wrote:This is a note to let you know that I've just added the patch titled mmc: meson-gx: fix deferred probing to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mmc-meson-gx-fix-deferred-probing.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 83c04755733ff8e8e9f832b8ff3f360d2419f424 Author: Sergey Shtylyov <s.shtylyov@xxxxxx> Date: Sat Jun 17 23:36:12 2023 +0300 mmc: meson-gx: fix deferred probing [ Upstream commit b8ada54fa1b83f3b6480d4cced71354301750153 ] The driver overrides the error codes and IRQ0 returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe permanently instead of the deferred probing. Switch to propagating the error codes upstream. Since commit ce753ad1549c ("platform: finally disallow IRQ0 in platform_get_irq() and its ilk") IRQ0 is no longer returned by those APIs, so we now can safely ignore it...The 5.15.y tree doesn't include that commit, so it's unsafe to apply this patch there.
Right, but the below "Fixes" commit:
Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking")
Is in the 5.15 tree, which is why this commit was picked up.
Cc: stable@xxxxxxxxxxxxxxx # v5.19+I added this tag for a reason!
So now we have two conflicting tags, one that tells us to pick this commit into any tree with cbcaac6d7dd2, and one that tells us to pick it into 5.19+ trees. Which one is correct? -- Thanks, Sasha
