* [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
@ 2021-02-18 15:28 Maxime Ripard
2021-02-23 21:26 ` Rob Herring
0 siblings, 1 reply; 8+ messages in thread
From: Maxime Ripard @ 2021-02-18 15:28 UTC (permalink / raw)
To: Rob Herring, Frank Rowand; +Cc: devicetree, Maxime Ripard
For some reason, unevaluatedProperties doesn't work and
additionalProperties is required. Fix it by switching to
additionalProperties.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
.../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
index 57324a5f0271..a1d5a32660e0 100644
--- a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
+++ b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
@@ -109,7 +109,7 @@ required:
- resets
- ddc
-unevaluatedProperties: false
+additionalProperties: false
examples:
- |
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
2021-02-18 15:28 [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema Maxime Ripard
@ 2021-02-23 21:26 ` Rob Herring
2021-03-26 21:01 ` Rob Herring
0 siblings, 1 reply; 8+ messages in thread
From: Rob Herring @ 2021-02-23 21:26 UTC (permalink / raw)
To: Maxime Ripard; +Cc: Frank Rowand, Rob Herring, devicetree
On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> For some reason, unevaluatedProperties doesn't work and
> additionalProperties is required. Fix it by switching to
> additionalProperties.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
> .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Applied, thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
2021-02-23 21:26 ` Rob Herring
@ 2021-03-26 21:01 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2021-03-26 21:01 UTC (permalink / raw)
To: Maxime Ripard; +Cc: Frank Rowand, devicetree, dri-devel, Stephen Rothwell
On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
>
> On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > For some reason, unevaluatedProperties doesn't work and
> > additionalProperties is required. Fix it by switching to
> > additionalProperties.
> >
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > ---
> > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
>
> Applied, thanks!
Something weird is going on with this fix. linux-next doesn't end up
with the change even though 5.12-rc2 has it. I suspect it's because
the original commit is in 2 branches (drm-misc-next and
drm-misc-fixes), but the fix was applied by me. I'm not sure how
linux-next didn't have a manual merge for this.
Rob
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
@ 2021-03-26 21:01 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2021-03-26 21:01 UTC (permalink / raw)
To: Maxime Ripard; +Cc: devicetree, Frank Rowand, dri-devel, Stephen Rothwell
On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
>
> On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > For some reason, unevaluatedProperties doesn't work and
> > additionalProperties is required. Fix it by switching to
> > additionalProperties.
> >
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > ---
> > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
>
> Applied, thanks!
Something weird is going on with this fix. linux-next doesn't end up
with the change even though 5.12-rc2 has it. I suspect it's because
the original commit is in 2 branches (drm-misc-next and
drm-misc-fixes), but the fix was applied by me. I'm not sure how
linux-next didn't have a manual merge for this.
Rob
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
2021-03-26 21:01 ` Rob Herring
@ 2021-03-26 23:00 ` Stephen Rothwell
-1 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2021-03-26 23:00 UTC (permalink / raw)
To: Rob Herring; +Cc: Maxime Ripard, Frank Rowand, devicetree, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2182 bytes --]
Hi Rob,
On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <robh+dt@kernel.org> wrote:
>
> On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
> >
> > On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > > For some reason, unevaluatedProperties doesn't work and
> > > additionalProperties is required. Fix it by switching to
> > > additionalProperties.
> > >
> > > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > > ---
> > > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> >
> > Applied, thanks!
>
> Something weird is going on with this fix. linux-next doesn't end up
> with the change even though 5.12-rc2 has it. I suspect it's because
> the original commit is in 2 branches (drm-misc-next and
> drm-misc-fixes), but the fix was applied by me. I'm not sure how
> linux-next didn't have a manual merge for this.
I think it goes like this:
Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged
into v5.12-rc1-dontuse and had "additionalProperties: false" and is the
common base for all later changes to this file.
Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and
hotplug interrupts") changes to "unevaluatedProperties: false" and is
merged into v5.12-rc1-dontuse.
Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema")
changes to "additionalProperties: false" and is merged into v5.12-rc2.
Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add
CEC and hotplug interrupts") changes (from a99163e9e708) to
"unevaluatedProperties: false" in the drm-misc and then drm trees.
When I come to merge the drm tree into linux-next, the merge base is
v5.12-rc3 and the only change to this file since v5.12-rc3 is in the
drm tree ...
Another way to look at it is that one one side of my merge, the line
goes from "additionalProperties: false" to "unevaluatedProperties:
false" and back to "additionalProperties: false" (so no net change)
and on the other side if my merge the line changes to
"unevaluatedProperties: false".
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
@ 2021-03-26 23:00 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2021-03-26 23:00 UTC (permalink / raw)
To: Rob Herring; +Cc: devicetree, Frank Rowand, Maxime Ripard, dri-devel
[-- Attachment #1.1: Type: text/plain, Size: 2182 bytes --]
Hi Rob,
On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <robh+dt@kernel.org> wrote:
>
> On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
> >
> > On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > > For some reason, unevaluatedProperties doesn't work and
> > > additionalProperties is required. Fix it by switching to
> > > additionalProperties.
> > >
> > > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > > ---
> > > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> >
> > Applied, thanks!
>
> Something weird is going on with this fix. linux-next doesn't end up
> with the change even though 5.12-rc2 has it. I suspect it's because
> the original commit is in 2 branches (drm-misc-next and
> drm-misc-fixes), but the fix was applied by me. I'm not sure how
> linux-next didn't have a manual merge for this.
I think it goes like this:
Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged
into v5.12-rc1-dontuse and had "additionalProperties: false" and is the
common base for all later changes to this file.
Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and
hotplug interrupts") changes to "unevaluatedProperties: false" and is
merged into v5.12-rc1-dontuse.
Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema")
changes to "additionalProperties: false" and is merged into v5.12-rc2.
Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add
CEC and hotplug interrupts") changes (from a99163e9e708) to
"unevaluatedProperties: false" in the drm-misc and then drm trees.
When I come to merge the drm tree into linux-next, the merge base is
v5.12-rc3 and the only change to this file since v5.12-rc3 is in the
drm tree ...
Another way to look at it is that one one side of my merge, the line
goes from "additionalProperties: false" to "unevaluatedProperties:
false" and back to "additionalProperties: false" (so no net change)
and on the other side if my merge the line changes to
"unevaluatedProperties: false".
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
2021-03-26 23:00 ` Stephen Rothwell
@ 2021-03-30 8:58 ` Maxime Ripard
-1 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2021-03-30 8:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Rob Herring, Frank Rowand, devicetree, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2500 bytes --]
Hi Stephen,
On Sat, Mar 27, 2021 at 10:00:26AM +1100, Stephen Rothwell wrote:
> Hi Rob,
>
> On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <robh+dt@kernel.org> wrote:
> >
> > On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
> > >
> > > On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > > > For some reason, unevaluatedProperties doesn't work and
> > > > additionalProperties is required. Fix it by switching to
> > > > additionalProperties.
> > > >
> > > > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > > > ---
> > > > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > >
> > > Applied, thanks!
> >
> > Something weird is going on with this fix. linux-next doesn't end up
> > with the change even though 5.12-rc2 has it. I suspect it's because
> > the original commit is in 2 branches (drm-misc-next and
> > drm-misc-fixes), but the fix was applied by me. I'm not sure how
> > linux-next didn't have a manual merge for this.
>
> I think it goes like this:
>
> Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged
> into v5.12-rc1-dontuse and had "additionalProperties: false" and is the
> common base for all later changes to this file.
>
> Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and
> hotplug interrupts") changes to "unevaluatedProperties: false" and is
> merged into v5.12-rc1-dontuse.
>
> Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema")
> changes to "additionalProperties: false" and is merged into v5.12-rc2.
>
> Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add
> CEC and hotplug interrupts") changes (from a99163e9e708) to
> "unevaluatedProperties: false" in the drm-misc and then drm trees.
>
> When I come to merge the drm tree into linux-next, the merge base is
> v5.12-rc3 and the only change to this file since v5.12-rc3 is in the
> drm tree ...
>
> Another way to look at it is that one one side of my merge, the line
> goes from "additionalProperties: false" to "unevaluatedProperties:
> false" and back to "additionalProperties: false" (so no net change)
> and on the other side if my merge the line changes to
> "unevaluatedProperties: false".
So I guess the easiest fix for this would be to merge it through
DRM-misc? Or should we just wait until all the branches gets merged in
Linus' tree?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
@ 2021-03-30 8:58 ` Maxime Ripard
0 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2021-03-30 8:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: devicetree, Rob Herring, Frank Rowand, dri-devel
[-- Attachment #1.1: Type: text/plain, Size: 2500 bytes --]
Hi Stephen,
On Sat, Mar 27, 2021 at 10:00:26AM +1100, Stephen Rothwell wrote:
> Hi Rob,
>
> On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <robh+dt@kernel.org> wrote:
> >
> > On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@kernel.org> wrote:
> > >
> > > On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote:
> > > > For some reason, unevaluatedProperties doesn't work and
> > > > additionalProperties is required. Fix it by switching to
> > > > additionalProperties.
> > > >
> > > > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > > > ---
> > > > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > >
> > > Applied, thanks!
> >
> > Something weird is going on with this fix. linux-next doesn't end up
> > with the change even though 5.12-rc2 has it. I suspect it's because
> > the original commit is in 2 branches (drm-misc-next and
> > drm-misc-fixes), but the fix was applied by me. I'm not sure how
> > linux-next didn't have a manual merge for this.
>
> I think it goes like this:
>
> Commit a99163e9e708 ("Merge drm/drm-next into drm-misc-next") was merged
> into v5.12-rc1-dontuse and had "additionalProperties: false" and is the
> common base for all later changes to this file.
>
> Commit 6ff92deff711 ("dt-binding: display: bcm2711-hdmi: Add CEC and
> hotplug interrupts") changes to "unevaluatedProperties: false" and is
> merged into v5.12-rc1-dontuse.
>
> Commit a3cb15cda1b8 ("dt-bindings: bcm2711-hdmi: Fix broken schema")
> changes to "additionalProperties: false" and is merged into v5.12-rc2.
>
> Commit e7cbc68a28e1 ("dt-binding: display: bcm2711-hdmi: Add
> CEC and hotplug interrupts") changes (from a99163e9e708) to
> "unevaluatedProperties: false" in the drm-misc and then drm trees.
>
> When I come to merge the drm tree into linux-next, the merge base is
> v5.12-rc3 and the only change to this file since v5.12-rc3 is in the
> drm tree ...
>
> Another way to look at it is that one one side of my merge, the line
> goes from "additionalProperties: false" to "unevaluatedProperties:
> false" and back to "additionalProperties: false" (so no net change)
> and on the other side if my merge the line changes to
> "unevaluatedProperties: false".
So I guess the easiest fix for this would be to merge it through
DRM-misc? Or should we just wait until all the branches gets merged in
Linus' tree?
Maxime
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-30 8:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-18 15:28 [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema Maxime Ripard
2021-02-23 21:26 ` Rob Herring
2021-03-26 21:01 ` Rob Herring
2021-03-26 21:01 ` Rob Herring
2021-03-26 23:00 ` Stephen Rothwell
2021-03-26 23:00 ` Stephen Rothwell
2021-03-30 8:58 ` Maxime Ripard
2021-03-30 8:58 ` Maxime Ripard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.