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