From: Vinod Koul <vkoul@kernel.org>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Mark Brown <broonie@kernel.org>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Bryan O'Donoghue <bod@kernel.org>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
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:56:27 +0100 [thread overview]
Message-ID: <ar9Vm-VPzqhtC8SQ@parshuram> (raw)
In-Reply-To: <52ef6837-7183-402d-acc6-8ca15c7e27ca@kernel.org>
On 02-10-26, 07:33, Krzysztof Kozlowski wrote:
> 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?
This is even worse. Immutable branch was provided, so people can pull.
Looks like folks cherry-picked instead. They need to fix it...
>
> >
> > 3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
> >
> > from the phy-next tree.
> >
>
>
> Best regards,
> Krzysztof
--
~Vinod
next prev parent reply other threads:[~2026-10-02 6:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 14:37 linux-next: manual merge of the phy-next tree with the v4l-dvb tree Mark Brown
2026-10-02 5:33 ` Krzysztof Kozlowski
2026-10-02 6:56 ` Vinod Koul [this message]
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=ar9Vm-VPzqhtC8SQ@parshuram \
--to=vkoul@kernel.org \
--cc=bod@kernel.org \
--cc=broonie@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=kishon@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nihal.gupta@oss.qualcomm.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.