Andrii Nakryiko 2c0e53cb08 sync: attempt to auto-resolve non-libbpf conflicts ...

If cherry-picked commit contains non-libbpf files, chances are high that
this will result in conflict, because we are generally skipping commits
that didn't touch libbpf files, which means that our working copy will
not be up-to-date for non-libbpf files. This change checks if conflicts
are only in non-libbpf files and marks them as resolved. This will work
fine as long as we don't cherry-pick some more non-libbpf changes to
same set of files that happen to conflict with not-so-resolved version
of non-libbpf files. But anyways, this should help in a lot of cases.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>

2019-08-09 08:41:26 -07:00

..

check-reallocarray.sh

Fix redirect in check-reallocarray (#7)

2019-01-07 20:34:42 -08:00

sync-kernel.sh

sync: attempt to auto-resolve non-libbpf conflicts

2019-08-09 08:41:26 -07:00