On Sun, Jun 23, 2024 at 12:43:24AM +0900, Krzysztof Wilczyński wrote:
> Hello,
>
> [...]
> > Could you possibly include the commit:
> > 3d2e425263e2 ("PCI: dwc: ep: Add a generic dw_pcie_ep_linkdown() API to handle Link Down event")
> > from the controller/dwc branch in the controller/rockchip as well,
> > or rebase the controller/rockchip branch on top of the controller/dwc branch,
> > or merge the controller/dwc branch to the controller/rockchip branch?
> >
>
> Done.
>
> > Additionally, since you picked up Mani's series which removes
> > dw_pcie_ep_init_notify() on the controller/dwc branch:
> > 9eba2f70362f ("PCI: dwc: ep: Remove dw_pcie_ep_init_notify() wrapper")
> >
> > You will need to pick up this patch as well:
> > https://lore.kernel.org/linux-pci/20240622132024.2927799-2-cassel@xxxxxxxxxx/T/#u
> > Otherwise there will be a build error when merging the controller/dwc
> > and the controller/rockchip branch to for-next.
> > The patch that I sent out can be picked up to the controller/rockchip right
> > now (since the API that Mani is switching to already exists in Linus's tree).
>
> Done.
>
> Hopefully, this settles things for a bit.
Everything looks good! :)
I'm glad that we got this sorted quickly, thank you Krzysztof!
Kind regards,
Niklas
