From: Krzysztof Kozlowski <krzk@kernel.org>
To: Mark Brown <broonie@kernel.org>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Vinod Koul <vkoul@kernel.org>, Bryan O'Donoghue <bod@kernel.org>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Nihal Kumar Gupta <nihal.gupta@oss.qualcomm.com>
Subject: Re: linux-next: manual merge of the phy-next tree with the v4l-dvb tree
Date: Fri, 2 Oct 2026 07:33:01 +0200 [thread overview]
Message-ID: <52ef6837-7183-402d-acc6-8ca15c7e27ca@kernel.org> (raw)
In-Reply-To: <ar5wFFE64tWhmCKg@sirena.org.uk>
On 01/10/2026 16:37, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
>
> between commits:
>
> 42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
> a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")
>
> from the v4l-dvb tree and commit:
Why were these taken via v4l/media tree?
>
> 3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>
> from the phy-next tree.
>
Best regards,
Krzysztof
next prev parent reply other threads:[~2026-10-02 5:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 14:37 Mark Brown
2026-10-02 5:33 ` Krzysztof Kozlowski [this message]
2026-10-02 6:56 ` Vinod Koul
2026-10-02 8:46 ` Bryan O'Donoghue
2026-10-02 8:30 ` Bryan O'Donoghue
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=52ef6837-7183-402d-acc6-8ca15c7e27ca@kernel.org \
--to=krzk@kernel.org \
--cc=bod@kernel.org \
--cc=broonie@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=kishon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nihal.gupta@oss.qualcomm.com \
--cc=vkoul@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®