mirror of
https://gitee.com/openharmony/third_party_libbpf
synced 2024-10-07 06:23:25 +00:00
33ec2ca026
git apply -3 doesn't always leave conflicted files in the working directory. Use patch --merge instead, it seems to work better in more complicated situations. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> |
||
---|---|---|
.. | ||
coverity.sh | ||
sync-kernel.sh |