git checkout master
git pull https://gitee.com/stavewu/kernel_linux_patches.git conflict-master-fix-20250615
git push origin master