diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh index 9ea1d56..45b4212 100755 --- a/scripts/sync-kernel.sh +++ b/scripts/sync-kernel.sh @@ -264,7 +264,7 @@ git checkout -b ${LIBBPF_SYNC_TAG} for patch in $(ls -1 ${TMP_DIR}/patches | tail -n +2); do if ! git am -3 --committer-date-is-author-date "${TMP_DIR}/patches/${patch}"; then - if ! git apply -3 "${TMP_DIR}/patches/${patch}"; then + if ! patch -p1 --merge < "${TMP_DIR}/patches/${patch}"; then read -p "Applying ${TMP_DIR}/patches/${patch} failed, please resolve manually and press to proceed..." fi git am --continue