Hello,
> > Perhaps the smartest thing right now is to just recreate the
> > pci/controller/rockchip branch, by:
> > 1) reset the rockchip branch to v6.10-rc1
> > 2) merge the pci/controller/dwc branch to the rockchip branch
> > 3) merge the pci/endpoint branch to to the rockchip branch
> > 4) pick all the patches that are currently on the pci/controller/rockchip
> > 5) squash: 246afbe0f6fc ("PCI: dw-rockchip: Use pci_epc_init_notify() directly")
> > into the commit that adds dw-rockchip endpoint mode support
> > (9b2ba393b3a6 ("PCI: dw-rockchip: Add endpoint mode support"))
> > 6) squash: https://lore.kernel.org/linux-pci/20240626191325.4074794-2-cassel@xxxxxxxxxx/
> > into the commit that adds dw-rockchip endpoint mode support
> > (9b2ba393b3a6 ("PCI: dw-rockchip: Add endpoint mode support"))
> >
> >
> > This way:
> > - All commits will build as individual patches, so no build errors from the
> > test robot (even when it builds a patch that is in the middle (e.g. 10/11)).
> > - Even if futher commits are applied to pci/controller/dwc or pci/endpoint,
> > we will not depend on any newly applied patches to these branches, so there
> > will be no need to "re-merge" the branches to the rockchip branch.
>
> The end result would look like this:
> https://github.com/floatious/linux/commits/dw-rockchip-remerge-example/
>
> (Just in case you want to git diff to see that we did the same thing...)
Thank you for this!
I did some work on the branch with an aim to fix the issues bot kindly
reported to us, a bit before I saw your message. Hopfully, I got things
right this time, and if not, then I will apply your steps/suggestion.
Krzysztof
