netdev - Re: [PATCH bpf-next v2 0/3] selftests: bpf: break up test

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190128055719.kqvebv2ievpklydy@ast-mbp>
Date:   Sun, 27 Jan 2019 21:57:20 -0800
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     Jakub Kicinski <jakub.kicinski@...ronome.com>
Cc:     Daniel Borkmann <daniel@...earbox.net>, netdev@...r.kernel.org
Subject: Re: [PATCH bpf-next v2 0/3] selftests: bpf: break up test_verifier

On Sun, Jan 27, 2019 at 08:54:13PM -0800, Jakub Kicinski wrote:
> On Sun, 27 Jan 2019 12:56:39 -0800, Alexei Starovoitov wrote:
> > On Sun, Jan 27, 2019 at 10:33 AM Jakub Kicinski wrote:
> > >
> > > Looks like v2 just applies cleanly again, should I repost?  
> > 
> > v2 set:
> > https://patchwork.ozlabs.org/series/88320/mbox/
> > doesn't apply cleanly.
> > Pls report.
> 
> I rebased and regenerated but the patches came out identical :(
> 
> Then I tried to apply and it does:
> 
> $ git fetch bpf-next 
> $ git checkout bpf-next/master 
> $ git log --oneline | head -1
> ae575c8a9868 Merge branch 'jmp32-insns'
> $ git am /tmp/selftests-bpf-break-up-test_verifier.patch
> Applying: selftests: bpf: prepare for break up of verifier tests
> Applying: selftests: bpf: break up test_verifier
> Applying: selftests: bpf: break up the rest of test_verifier
> $ md5sum /tmp/selftests-bpf-break-up-test_verifier.patch
> 70ebd5f1162605b71851b129230cd19e  /tmp/selftests-bpf-break-up-test_verifier.patch
> 
> Could you double check?  Maybe its something with my tree :S

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
----

But the odds were in my favor tonight :)

Applied to bpf-next. Thanks!