On Tue, May 28, 2024 at 01:02:07AM +0800, Jianfeng Liu wrote: > Devicetree of ArmSoM Sige7 is merged to kernel v6.10-rc1 with USBDP and > GPU nodes. So I use update-dts-subtree.sh to pick related commits of > rk3588s.dtsi, and then pick the commit of ArmSoM Sige7's devicetree. > I also did run command: > ./dts/update-dts-subtree.sh pull v6.10-rc1-dts > based on my work but there is a merge conflict of file: > dts/upstream/Bindings/Makefile > I think this should not be related to my work.
Yes, I took a quick look at the conflict is unrelated to your series here and also with a quick local apply then resync to v6.10-rc1 everything else works as expected from my point of view. -- Tom
signature.asc
Description: PGP signature
