On Tue, Mar 23, 2021 at 10:36:32AM -0600, Rob Herring wrote: > Users of the audio-graph-port schema need to define how many ports > and what each port is, so they need to define 'ports' and/or 'port' > anyways. Let's drop 'ports' and 'port' from the schema and adjust users > to reference audio-graph-port.yaml from a port property. This doesn't apply against current code, please check and resend: Applying: ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml Using index info to reconstruct a base tree... M Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml Falling back to patching base and 3-way merge... Auto-merging Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml error: Failed to merge in the changes.
Attachment:
signature.asc
Description: PGP signature
