Andrii Nakryiko 947e40e1fd sync_kernel.sh: revamp sync script to work in the presence of merges (#15) ...

Previous version of script relied on squashing baseline commit and
rebasing rest of commits on top of it. This doesn't work well with git
histories containing merges. This patch changes approach by cherry-picking
commits that have libbpf-related changes and then rewriting history since
last checkpoint.

This still might fail if there were manually resolved merge conflicts for
libbpf, but it's the best we can get as far as I can tell.

Script now also verifies that state of libbpf in Linux's repository exactly
matches the state of libbpf in github repo.

If everything goes smoothing (including verification step), we clean up after
ourselves and only leave libbpf-sync-XXX branch in github's libbpf repo to
push to remote.

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

2019-03-02 21:19:17 -08:00

..

check-reallocarray.sh

Fix redirect in check-reallocarray (#7)

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

sync-kernel.sh

sync_kernel.sh: revamp sync script to work in the presence of merges (#15)

2019-03-02 21:19:17 -08:00