On 5/23/23 02:58, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > 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 <stable@xxxxxxxxxxxxxxx>. > > 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 a7844528722619d2f97740ae5ec747afff18c4be > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023052249-duplex-pampered-89cb@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. > > Possible dependencies: > > a78445287226 ("dt-bindings: ata: ahci-ceva: Cover all 4 iommus entries") > f2fb1b50fbac ("dt-bindings: ata: ahci-ceva: convert to yaml") Mikal, Do you need this patch added to 5.15 stable as well ? If yes, then please send a backport. I think the issue is that the bindings file in 5.15 is not yaml format. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From a7844528722619d2f97740ae5ec747afff18c4be Mon Sep 17 00:00:00 2001 > From: Michal Simek <michal.simek@xxxxxxx> > Date: Fri, 12 May 2023 13:52:04 +0200 > Subject: [PATCH] dt-bindings: ata: ahci-ceva: Cover all 4 iommus entries > > Current only one entry is enabled but IP itself is using 4 different IDs > which are already listed in zynqmp.dtsi. > > sata: ahci@fd0c0000 { > compatible = "ceva,ahci-1v84"; > ... > iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, > <&smmu 0x4c2>, <&smmu 0x4c3>; > }; > > Fixes: 8ac47837f0e0 ("arm64: dts: zynqmp: Add missing iommu IDs") > Cc: stable@xxxxxxxxxxxxxxx # v5.12+ > Signed-off-by: Michal Simek <michal.simek@xxxxxxx> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx> > > diff --git a/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml b/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml > index 9b31f864e071..71364c6081ff 100644 > --- a/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml > +++ b/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml > @@ -32,7 +32,7 @@ properties: > maxItems: 1 > > iommus: > - maxItems: 1 > + maxItems: 4 > > power-domains: > maxItems: 1 > -- Damien Le Moal Western Digital Research
