Hi Rob,
On Fri, 26 Mar 2021 15:01:34 -0600 Rob Herring <robh+dt@xxxxxxxxxx> wrote:
>
> On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh@xxxxxxxxxx> 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@xxxxxxxxxx>
> > > ---
> > > .../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:
pgpAwgKHaORCW.pgp
Description: OpenPGP digital signature
