This is a leftover from when the binding schema had the compatible string
property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
got dropped during the binding review process.
Reported-by: Rob Herring <[email protected]>
Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
Signed-off-by: Javier Martinez Canillas <[email protected]>
---
.../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
index 0aa41bd9ddca..37975ee61c5a 100644
--- a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
+++ b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
@@ -11,10 +11,10 @@ maintainers:
properties:
compatible:
- - enum:
- - solomon,ssd1322
- - solomon,ssd1325
- - solomon,ssd1327
+ enum:
+ - solomon,ssd1322
+ - solomon,ssd1325
+ - solomon,ssd1327
required:
- compatible
--
2.41.0
On Sat, Oct 21, 2023 at 12:30:17AM +0200, Javier Martinez Canillas wrote:
> This is a leftover from when the binding schema had the compatible string
> property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
> got dropped during the binding review process.
>
> Reported-by: Rob Herring <[email protected]>
> Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
> Signed-off-by: Javier Martinez Canillas <[email protected]>
Acked-by: Conor Dooley <[email protected]>
Thanks,
Conor.
> ---
>
> .../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
> index 0aa41bd9ddca..37975ee61c5a 100644
> --- a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
> +++ b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
> @@ -11,10 +11,10 @@ maintainers:
>
> properties:
> compatible:
> - - enum:
> - - solomon,ssd1322
> - - solomon,ssd1325
> - - solomon,ssd1327
> + enum:
> + - solomon,ssd1322
> + - solomon,ssd1325
> + - solomon,ssd1327
>
> required:
> - compatible
> --
> 2.41.0
>
On Sat, 21 Oct 2023 00:30:17 +0200, Javier Martinez Canillas wrote:
> This is a leftover from when the binding schema had the compatible string
> property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
> got dropped during the binding review process.
>
> Reported-by: Rob Herring <[email protected]>
> Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
> Signed-off-by: Javier Martinez Canillas <[email protected]>
> ---
>
> .../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
Rob Herring <[email protected]> writes:
> On Sat, 21 Oct 2023 00:30:17 +0200, Javier Martinez Canillas wrote:
>> This is a leftover from when the binding schema had the compatible string
>> property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
>> got dropped during the binding review process.
>>
>> Reported-by: Rob Herring <[email protected]>
>> Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
>> Signed-off-by: Javier Martinez Canillas <[email protected]>
>> ---
>>
>> .../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>
> Reviewed-by: Rob Herring <[email protected]>
>
Pushed to drm-misc (drm-misc-next). Thanks!
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat
On Fri, Oct 27, 2023 at 11:30:56AM +0200, Javier Martinez Canillas wrote:
> Rob Herring <[email protected]> writes:
>
> > On Sat, 21 Oct 2023 00:30:17 +0200, Javier Martinez Canillas wrote:
> >> This is a leftover from when the binding schema had the compatible string
> >> property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
> >> got dropped during the binding review process.
> >>
> >> Reported-by: Rob Herring <[email protected]>
> >> Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
> >> Signed-off-by: Javier Martinez Canillas <[email protected]>
> >> ---
> >>
> >> .../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
> >> 1 file changed, 4 insertions(+), 4 deletions(-)
> >>
> >
> > Reviewed-by: Rob Herring <[email protected]>
> >
>
> Pushed to drm-misc (drm-misc-next). Thanks!
Given what introduced this is before the drm-misc-next-2023-10-19 tag,
isn't it going into 6.7 and needs to be in the fixes branch? Though that
doesn't exist yet for 6.7 fixes. I don't understand why that's not done
as part of the last tag for a cycle. But drm-misc is special.
Rob
Rob Herring <[email protected]> writes:
Hello Rob,
> On Fri, Oct 27, 2023 at 11:30:56AM +0200, Javier Martinez Canillas wrote:
>> Rob Herring <[email protected]> writes:
>>
>> > On Sat, 21 Oct 2023 00:30:17 +0200, Javier Martinez Canillas wrote:
>> >> This is a leftover from when the binding schema had the compatible string
>> >> property enum as a 'oneOf' child and the '-' was not removed when 'oneOf'
>> >> got dropped during the binding review process.
>> >>
>> >> Reported-by: Rob Herring <[email protected]>
>> >> Closes: https://lore.kernel.org/dri-devel/CAL_Jsq+h8DcnpKqhokQOODCc8+Qi3M0PrxRFKz_Y4v37yMJvvA@mail.gmail.com/
>> >> Signed-off-by: Javier Martinez Canillas <[email protected]>
>> >> ---
>> >>
>> >> .../devicetree/bindings/display/solomon,ssd132x.yaml | 8 ++++----
>> >> 1 file changed, 4 insertions(+), 4 deletions(-)
>> >>
>> >
>> > Reviewed-by: Rob Herring <[email protected]>
>> >
>>
>> Pushed to drm-misc (drm-misc-next). Thanks!
>
> Given what introduced this is before the drm-misc-next-2023-10-19 tag,
> isn't it going into 6.7 and needs to be in the fixes branch? Though that
> doesn't exist yet for 6.7 fixes. I don't understand why that's not done
> as part of the last tag for a cycle. But drm-misc is special.
>
I pushed to drm-misc-next because I thought that there will be a last PR
of drm-misc-next for 6.7, but it seems I missed it for a couple of hours
(that is drm-misc-next-2023-10-27) :(
https://lists.freedesktop.org/archives/dri-devel/2023-October/425698.html
The solution now is to cherry-pick the fixes already in drm-misc-next to
drm-misc-next-fixes, to make sure that land in 6.7. I can do that once
drm-next is back merged to that branch, if you think the schema warning
fix must land in 6.7 and can't wait for the next release.
> Rob
>
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat
Javier Martinez Canillas <[email protected]> writes:
[...]
>>> Pushed to drm-misc (drm-misc-next). Thanks!
>>
>> Given what introduced this is before the drm-misc-next-2023-10-19 tag,
>> isn't it going into 6.7 and needs to be in the fixes branch? Though that
>> doesn't exist yet for 6.7 fixes. I don't understand why that's not done
>> as part of the last tag for a cycle. But drm-misc is special.
>>
>
> I pushed to drm-misc-next because I thought that there will be a last PR
> of drm-misc-next for 6.7, but it seems I missed it for a couple of hours
> (that is drm-misc-next-2023-10-27) :(
>
> https://lists.freedesktop.org/archives/dri-devel/2023-October/425698.html
>
> The solution now is to cherry-pick the fixes already in drm-misc-next to
> drm-misc-next-fixes, to make sure that land in 6.7. I can do that once
> drm-next is back merged to that branch, if you think the schema warning
> fix must land in 6.7 and can't wait for the next release.
>
Or wait for the drm-misc-fixes branch to be back merged and land it as a
part of the 6.7-rc cycle. I'll do that since it would cause less trouble
to the drm-misc maintainers.
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat
Javier Martinez Canillas <[email protected]> writes:
> Rob Herring <[email protected]> writes:
>
> Hello Rob,
>
[...]
>>> Pushed to drm-misc (drm-misc-next). Thanks!
>>
>> Given what introduced this is before the drm-misc-next-2023-10-19 tag,
>> isn't it going into 6.7 and needs to be in the fixes branch? Though that
>> doesn't exist yet for 6.7 fixes. I don't understand why that's not done
>> as part of the last tag for a cycle. But drm-misc is special.
>>
>
> I pushed to drm-misc-next because I thought that there will be a last PR
> of drm-misc-next for 6.7, but it seems I missed it for a couple of hours
> (that is drm-misc-next-2023-10-27) :(
>
> https://lists.freedesktop.org/archives/dri-devel/2023-October/425698.html
>
> The solution now is to cherry-pick the fixes already in drm-misc-next to
> drm-misc-next-fixes, to make sure that land in 6.7. I can do that once
Cherry-picked the commit in drm-misc-next-fixes as well.
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat