急急急 git patch Kernel-driver-add-7.85-module-support 冲突
使用 0001-Kernel-driver-add-7.85-module-support.patch这个补丁的时候发生冲突，git am --signoff < ../../../0001-Kernel-driver-add-7.85-module-support.patch
错误信息：
Applying: Kernel->driver:add 7.85 module support
fatal: patch fragment without header at line 81: @@ -624,6 +624,29 @@
Patch failed at 0001 Kernel->driver:add 7.85 module support
The copy of the patch that failed is found in:
/home/sun/android/firefly/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
有人知道是怎么回事吗
页:
[1]