From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>, netdev@vger.kernel.org
Subject: Re: [PATCH bpf-next v2 0/3] selftests: bpf: break up test_verifier
Date: Sun, 27 Jan 2019 21:57:20 -0800 [thread overview]
Message-ID: <20190128055719.kqvebv2ievpklydy@ast-mbp> (raw)
In-Reply-To: <20190127205413.231fcc05@cakuba.hsd1.ca.comcast.net>
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!
next prev parent reply other threads:[~2019-01-28 5:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 23:24 [PATCH bpf-next v2 0/3] selftests: bpf: break up test_verifier Jakub Kicinski
2019-01-25 23:24 ` [PATCH bpf-next v2 1/3] selftests: bpf: prepare for break up of verifier tests Jakub Kicinski
2019-01-25 23:24 ` [PATCH bpf-next v2 3/3] selftests: bpf: break up the rest of test_verifier Jakub Kicinski
2019-01-26 5:55 ` [PATCH bpf-next v2 0/3] selftests: bpf: break up test_verifier Alexei Starovoitov
2019-01-26 6:17 ` Jakub Kicinski
2019-01-26 6:21 ` Alexei Starovoitov
2019-01-27 18:33 ` Jakub Kicinski
2019-01-27 20:56 ` Alexei Starovoitov
[not found] ` <20190127205413.231fcc05@cakuba.hsd1.ca.comcast.net>
2019-01-28 5:57 ` Alexei Starovoitov [this message]
2019-01-28 16:45 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190128055719.kqvebv2ievpklydy@ast-mbp \
--to=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox