Andrii Nakryiko 3ef05a585e sync: try harder when git am -3 fails ...

`git am -3` will give up frequently even in cases when patch can be
auto-merged with:

```
Applying: libbpf: Unify low-level map creation APIs w/ new bpf_map_create()
error: sha1 information is lacking or useless (src/libbpf.c).
error: could not build fake ancestor
Patch failed at 0001 libbpf: Unify low-level map creation APIs w/ new bpf_map_create()
```

But `git apply -3` in the same situation will succeed with three-way merge just
fine:

```
error: patch failed: src/bpf_gen_internal.h:51
Falling back to three-way merge...
Applied patch to 'src/bpf_gen_internal.h' cleanly.
```

So if git am fails, try git apply and if that succeeds, automatically
`git am --continue`. If not, fallback to user actions.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

2021-11-26 13:51:29 -08:00

..

coverity.sh

coverity: explicitly use bash instead of sh

2019-11-05 13:28:13 -08:00

sync-kernel.sh

sync: try harder when git am -3 fails

2021-11-26 13:51:29 -08:00