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=-8.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 6C3CDC43381 for ; Wed, 20 Feb 2019 00:46:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A8232147A for ; Wed, 20 Feb 2019 00:46:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Zu6ma0Pk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730148AbfBTAqA (ORCPT ); Tue, 19 Feb 2019 19:46:00 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:41871 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726986AbfBTAqA (ORCPT ); Tue, 19 Feb 2019 19:46:00 -0500 Received: by mail-lf1-f67.google.com with SMTP id e27so16238230lfj.8 for ; Tue, 19 Feb 2019 16:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iP/6ETy+pOSIbPoAv6tz/DPX0DtkuhYiTbgrcxVYuJ0=; b=Zu6ma0Pk6QIhVjqrZaUecHrMbyM7lw73sjll5ob7NOLXw5nXQFdXsU8i9qQnbOsWru b19Dqc2Ze5G/a4/vm/s62BrFS/jzKSGhvaCUWTlZzl4WNcNFTrstq3AOzBbOZ+3j9Ait 7wK/AN5QYIhxfn6l8crvv5SdbqxNHRMn1zxN2OWNm2OEb4VYYjO7jqf5o8LoJu9RL1Cz +B1qrQ3JkQC8nJT3PjRmkTXgUG44iQs/pE79hdI70s3E2dkXxznAiDAl0UaEqBiYDPr5 dXJgjD1vdgyruvKH60efmXV7US/KtCnIFyPfiKYM0JuBzcqNvsUrFBDmMZ5NXe3RKuQo 3ZQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iP/6ETy+pOSIbPoAv6tz/DPX0DtkuhYiTbgrcxVYuJ0=; b=pVq28dFFj51ENZLdNjgwUZ2OoYVnaCSXHdipjq5Y1MNd7CPBqhQ0om2G+YRJWvGrUb 5AmDEsifjZyEtr9fO2T34XvIfwFN6Rw2GzTbOwVvHH93o4GMJmubCC5l19EHFzhddGNm tggtSzgbNg8YVktuxNGntKqmkJhStifnrdfpDE8wncPZQek48/Bst1Lmpfpg8ebc9MGu y7t4624updcDekPKmqn7qrqKTXpzTDE2cGCBgRIBviZjooAtkrI22YGzdWP3lRiMlNvj M9GFSAV5k6sLr86eShwLmOQRRG3LT00GqB63uw25mIMRoJtZXofu0a6SKDd05dbKYw+/ KKDg== X-Gm-Message-State: AHQUAuYSD90jO1UZXH3X7O0/8UuG1XZz9llXrfhYbK+BsxzoDkXWYmO4 ehus5Eg6n9krHlRO4f234C6zPXTIHk28q3KaU8zuNg== X-Google-Smtp-Source: AHgI3IZFT+T74mL/CzSF/UWgZ47HA0U6j7PucCMD3cseHcUG8SrsibkiA8sgrHYk+BuB7Pvcq7KQoOUrSwRkDgGX9+s= X-Received: by 2002:ac2:4191:: with SMTP id z17mr18248649lfh.117.1550623557990; Tue, 19 Feb 2019 16:45:57 -0800 (PST) MIME-Version: 1.0 References: <20190220113729.49f28f73@canb.auug.org.au> In-Reply-To: From: Stanislav Fomichev Date: Tue, 19 Feb 2019 16:45:46 -0800 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree To: Alexei Starovoitov Cc: Stephen Rothwell , David Miller , Networking , Daniel Borkmann , Alexei Starovoitov , Linux Next Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Feb 19, 2019 at 4:41 PM Alexei Starovoitov wrote: > > On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > tools/testing/selftests/bpf/test_progs.c > > > > between commit: > > > > f6be4d16039b ("selftests/bpf: make sure signal interrupts BPF_PROG_TEST_RUN") > > Ouch. Thanks for the heads up. > > Daniel, > should we drop this one from bpf tree ? > I don't think it's strictly necessary. Yeah, those can go via the bpf-next three as well, not very critical. OTOH, I don't understand why is there a conflict? bpf and bpf-next adding tests in the same place/file? Those can be trivially resolved when bpf and bpf-next are merged in the next window. > > > from the bpf tree and commits: > > > > bf0f0fd93945 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector") > > ab963beb9f5d ("selftests/bpf: add bpf_spin_lock C test") > > ba72a7b4badb ("selftests/bpf: test for BPF_F_LOCK") > >