Hi,

On Sun, Nov 01, 2026 at 04:31:52PM +0530, Manivannan Sadhasivam wrote:
> On 2026-10-21 20:05 +0200, Sebastian Reichel wrote:
> > The recent Rockchip platform have a combined PHY, which does USB3 and
> > DisplayPort as well as muxing the lines in arbitrary order. Changing its
> > enabled functionality requires a PHY reset and as the PHY provides a
> > clock to the DWC3 controller, this can result in an SError. Apart from
> > that the PHY might not start up correctly when the DWC3 PIPE interface
> > is running. This series prepares a Rockchip specific DWC3 glue driver to
> > help out with these problems. To become useful more patches are needed
> > on the Rockchip USBDP PHY side, which are send separately.
> > 
> > This was split from the USBDP cleanup series. v17 has a dependency on
> > the patches that have been merged to phy's for-next branch. There are
> > some additional Rockchip USBDP phy fixes, which depend on this series
> > (which is effectively also a fix).
> 
> What is the merge strategy for this series?

I see these options (ordered by my preference):

1: Vinod merges everything; the USB side is mostly a new driver
   and thus there is not much conflict potential

2: Vinod provides an immutable branch with the first two patches,
   USB tree merges the immutable branch and the remaining series.

3: Everything is merged through USB; this would block the final
   cleanup for USBDP from being applied for yet another cycle.

4: Vinod merges patches 1+2, USB patches are merged one cycle
   later and final USBDP patches are merged two cycles later.

P.S.: I will have to send another version for the correct Sashiko
feedback on the DWC3 side.

Greetings,

-- Sebastian