From: Vinod Koul <vkoul@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: 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 dmaengine tree with the usb tree
Date: Tue, 15 Sep 2026 11:58:58 +0530 [thread overview]
Message-ID: <aqjlqvzPntq2dk54@parshuram> (raw)
In-Reply-To: <aqgKCmZJtMxQdNFU@sirena.co.uk>
Hey Greg,
On 14-09-26, 15:51, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the dmaengine tree got conflicts in:
>
> Documentation/devicetree/bindings/usb/am33xx-usb.txt
> Documentation/devicetree/bindings/usb/da8xx-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")
> 40d79fbfa9ab8 ("dt-bindings: usb: ti,da830-musb: Convert to DT schema")
>
> from the usb tree and commit:
>
> c64189e9772d7 ("dt-bindings: dma: ti,cppi41: Convert to DT schema")
This is binding for dmaengine driver, so I think it makes sense to go
via dmaengine tree. Or if you prefer to take whole pile as is, I can
drop this
--
~Vinod
prev parent reply other threads:[~2026-09-15 6:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 14:51 linux-next: manual merge of the dmaengine tree with the usb tree Mark Brown
2026-09-15 6:28 ` Vinod Koul [this message]
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=aqjlqvzPntq2dk54@parshuram \
--to=vkoul@kernel.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=j.bhargav.u@gmail.com \
--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 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.