From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>,
Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the devicetree tree with the sound-asoc tree
Date: Fri, 31 Mar 2023 12:47:58 +1100 [thread overview]
Message-ID: <20230331124758.501257d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml
between commit:
cfad817095e1 ("ASoC: dt-bindings: qcom,lpass-va-macro: Add missing NPL clock")
from the sound-asoc tree and commit:
d0dcd0ce8437 ("dt-bindings: yamllint: Require a space after a comment '#'")
from the devicetree tree.
I fixed it up (the former removed the text updated by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-03-31 1:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-31 1:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-27 1:48 linux-next: manual merge of the devicetree tree with the sound-asoc tree Stephen Rothwell
2023-03-28 23:32 Stephen Rothwell
2017-06-14 2:54 Stephen Rothwell
2017-06-14 13:55 ` Rob Herring
2017-06-14 14:30 ` Mark Brown
2017-06-14 20:52 ` Sakari Ailus
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=20230331124758.501257d7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox