From: Mark Brown <broonie@kernel.org>
To: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Sameer Pujar <spujar@nvidia.com>,
linux-kernel@vger.kernel.org,
Jonathan Hunter <jonathanh@nvidia.com>,
Lubomir Rintel <lkundrak@v3.sk>,
Thierry Reding <thierry.reding@gmail.com>,
linux-tegra@vger.kernel.org
Subject: Re: [PATCH 1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml
Date: Wed, 31 Mar 2021 13:41:29 +0100 [thread overview]
Message-ID: <20210331124129.GA12190@sirena.org.uk> (raw)
In-Reply-To: <20210323163634.877511-2-robh@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Lubomir Rintel <lkundrak@v3.sk>, Sameer Pujar <spujar@nvidia.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Thierry Reding <thierry.reding@gmail.com>,
linux-tegra@vger.kernel.org,
Jonathan Hunter <jonathanh@nvidia.com>
Subject: Re: [PATCH 1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml
Date: Wed, 31 Mar 2021 13:41:29 +0100 [thread overview]
Message-ID: <20210331124129.GA12190@sirena.org.uk> (raw)
In-Reply-To: <20210323163634.877511-2-robh@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-31 12:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 16:36 [PATCH 0/3] ASoC: dt-bindings: Rework audio-graph-port schema Rob Herring
2021-03-23 16:36 ` Rob Herring
2021-03-23 16:36 ` [PATCH 1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml Rob Herring
2021-03-23 16:36 ` Rob Herring
2021-03-23 19:15 ` Rob Herring
2021-03-23 19:15 ` Rob Herring
2021-03-31 12:41 ` Mark Brown [this message]
2021-03-31 12:41 ` Mark Brown
2021-03-23 16:36 ` [PATCH 2/3] ASoC: dt-bindings: Use OF graph schema Rob Herring
2021-03-23 16:36 ` Rob Herring
2021-03-23 16:36 ` [PATCH 3/3] ASoC: dt-bindings: socionext: Use audio-graph-port schema Rob Herring
2021-03-23 16:36 ` Rob Herring
2021-04-01 10:16 ` [PATCH 0/3] ASoC: dt-bindings: Rework " Mark Brown
2021-04-01 10:16 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210331124129.GA12190@sirena.org.uk \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lkundrak@v3.sk \
--cc=robh@kernel.org \
--cc=spujar@nvidia.com \
--cc=thierry.reding@gmail.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.