rk3288 kernel5.15

Author: lawrencetg

.github/workflows/build.yml

@@ -74,6 +74,8 @@ jobs:
         repo sync -c scripts/sd-fuse  --no-clone-bundle
         repo sync -c toolchain  --no-clone-bundle
 
+        echo "pwd: $PWD"
+        ls -l
         repo sync -c kernel --no-clone-bundle
         repo sync -c scripts --no-clone-bundle
         repo sync -c scripts/sd-fuse  --no-clone-bundle
@@ -191,11 +193,8 @@ jobs:
         repo sync -c scripts --no-clone-bundle
         repo sync -c scripts/sd-fuse  --no-clone-bundle
         repo sync -c toolchain  --no-clone-bundle
-<<<<<<< HEAD
-=======
         echo "pwd: $PWD"
         ls -l
->>>>>>> d8e888a (rk3288 kernel5.15)
         (cd kernel && git checkout nanopi-r2-v5.15.y)
         (cd scripts/sd-fuse && git checkout kernel-5.15.y)