On Sun, 27 Jan 2019 21:57:20 -0800, Alexei Starovoitov wrote: > My tripple check failed. > Turned out that the eariler attempt to merge it created > selftests/bpf/verifier/ directory with .gitignore file inside it > and 'git am --abort' and 'git rebase --hard' kept it in place. > (since .gitignore was there) > > 'git' wasn't very helpful with the following message either: > ---- > Applying: selftests: bpf: prepare for break up of verifier tests > error: sha1 information is lacking or useless > (tools/testing/selftests/bpf/Makefile). > error: could not build fake ancestor > Patch failed at 0001 selftests: bpf: prepare for break up of verifier tests
Aw, weirdness. > But the odds were in my favor tonight :) > > Applied to bpf-next. Thanks! Awesome :)
