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. > May I ask why all the branches for the different DWC glue drivers are not > based on the controller/dwc branch? No worries. > They are obviously going to be tightly related. Normally, we prefer to apply things to specific topic branches, but I will revisit this approach going forward, since changes between Endpoint, DWC and specific controller drivers are often tightly coupled, as you noted, which can make things a bit of a mess, unnecessarily. We are going to do some clean up once Bjorn sends his Pull Request. Krzysztof