From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED, USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70DEDC282C8 for ; Mon, 28 Jan 2019 05:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 376DA20989 for ; Mon, 28 Jan 2019 05:57:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WXi1YOad" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726612AbfA1F5Y (ORCPT ); Mon, 28 Jan 2019 00:57:24 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38234 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725782AbfA1F5Y (ORCPT ); Mon, 28 Jan 2019 00:57:24 -0500 Received: by mail-pf1-f194.google.com with SMTP id q1so7510372pfi.5 for ; Sun, 27 Jan 2019 21:57:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=mlu71k3b0qWY2+3lZJVvbDiMuxArFqYHeyT1tN4R0yk=; b=WXi1YOadwuD5fcuZ5Jirrd8zmip15uVbtWje+wv2tdb5rWO36I+kZD7UnpWoqoS9sj q3GvQCjBlEEwkZNpsRxQox4jEeFI9eB3hSa3xsr/ZwU2fmEwQnfVIVDwWwbpp7KTsdCr uYAc1iCRAZIPCXnKazq/i0jrVy7a05AIfVoB2eGjLVueRR/kNx6lcpgvyqCawtbpFroC okPgqbwa3WCRQYhgHXANqg2FmSEdqXmTj6ubiHsJwH18o2j55iIdEbTqYFktd/nAsfuE 343MiDbnolg8jTj9I4zQ+QBCPmWMoekcrq3tTY8FMTCKmOVi0uxdpxgBrdd7pZJ9a2Iz jv6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=mlu71k3b0qWY2+3lZJVvbDiMuxArFqYHeyT1tN4R0yk=; b=qG4na/7iggabUdK0GJy5XVO7GtKusvQpOz7JgdcoJFd3MLZ0DmaM8DmAjQi49O3yNL E4FTPEoT2td9j9zvyE7EeNX/xXU+AYWvPJlrY26RHTvWzwVc13/4w5l78jXxDjqxCdL9 N4EpqfW0ucRsBYP7pWr50XoWE1JdDybFd6Yq8xgt13x9gqDoJrTmcaihf5Uu7gAJkbAe ocACHvK9AgUmG3VWaSkf034IPYHLaA/k12DWSPCIWR27ZDCzLtRkkHktS1zhxmmnvnPp DeTo3K0fXZqrhuEQZGeYsicfOWwXAqIaRiv+qTQp7obytMn/4BFdfpMYOcrw9Jp6+GpY i6fA== X-Gm-Message-State: AJcUukeWYad+CPjQy/Ev21iKy/oGin0GjlotekMMTMWn1JunpXrbHVKn HCgLAWwXCSe2rqymXNZ49t4= X-Google-Smtp-Source: ALg8bN7XNJn8HHm7RK9DcXx0SSzH5XRphuabEemRI0ivnCR3B4QVMLp2muWrAyZT0ig8uQJDoiyZHg== X-Received: by 2002:a63:6346:: with SMTP id x67mr18627655pgb.183.1548655043310; Sun, 27 Jan 2019 21:57:23 -0800 (PST) Received: from ast-mbp ([2620:10d:c090:180::1:3d42]) by smtp.gmail.com with ESMTPSA id g28sm51443705pfd.100.2019.01.27.21.57.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 21:57:22 -0800 (PST) Date: Sun, 27 Jan 2019 21:57:20 -0800 From: Alexei Starovoitov To: Jakub Kicinski Cc: Daniel Borkmann , netdev@vger.kernel.org Subject: Re: [PATCH bpf-next v2 0/3] selftests: bpf: break up test_verifier Message-ID: <20190128055719.kqvebv2ievpklydy@ast-mbp> References: <20190125232444.30172-1-jakub.kicinski@netronome.com> <20190126055528.r3xvfgtazdf44ab6@ast-mbp.dhcp.thefacebook.com> <20190125221728.3990b9d1@cakuba.netronome.com> <20190126062120.pzb4jw2rzv6o5jp3@ast-mbp.dhcp.thefacebook.com> <20190127103328.266e363e@cakuba.hsd1.ca.comcast.net> <20190127205413.231fcc05@cakuba.hsd1.ca.comcast.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190127205413.231fcc05@cakuba.hsd1.ca.comcast.net> User-Agent: NeoMutt/20180223 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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!