From: Vinod Koul <vkoul@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>,
Bhargav Joshi <j.bhargav.u@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the usb tree
Date: Tue, 15 Sep 2026 11:55:19 +0530 [thread overview]
Message-ID: <aqjkz5TAHPvL7FzT@parshuram> (raw)
In-Reply-To: <aqf3I4J3OyKwcg6A@sirena.co.uk>
Hi Mark, Greg,
On 14-09-26, 14:31, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/usb/am33xx-usb.txt
>
> between commits:
>
> d0e95f1c08264 ("dt-bindings: dma: ti,cppi41: Convert to DT schema")
> 267e31adc4831 ("dt-bindings: phy: ti,am335x-usb-phy: Convert to DT schema")
> 1c09fe2edad27 ("dt-bindings: usb: ti,musb-am33xx: Convert to DT schema")
> 185bb9305937f ("dt-bindings: usb: ti,am335x-usb-ctrl-module: Convert to DT schema")
> ef7e123401d95 ("dt-bindings: usb: ti,am33xx-usb: Convert to DT schema")
>
> from the usb tree and commit:
>
> ae6ee6844d5aa ("dt-bindings: phy: ti,am335x-usb-phy: Convert to DT schema")
Okay I will drop this, it can go thru usb tree. Thanks
--
~Vinod
next prev parent reply other threads:[~2026-09-15 6:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 13:31 Mark Brown
2026-09-15 6:25 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 2:00 Stephen Rothwell
2023-10-04 6:39 ` Greg KH
2021-08-09 7:10 Stephen Rothwell
2021-08-09 7:39 ` Greg KH
2021-08-27 6:58 ` Stephen Rothwell
2021-08-27 8:20 ` Greg KH
2020-01-07 3:24 Stephen Rothwell
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=aqjkz5TAHPvL7FzT@parshuram \
--to=vkoul@kernel.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=j.bhargav.u@gmail.com \
--cc=kishon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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®