From patchwork Sun Oct 13 23:32:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1175924 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ti/8B17a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ryfW49JBz9sPK for ; Mon, 14 Oct 2019 10:32:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729468AbfJMXci (ORCPT ); Sun, 13 Oct 2019 19:32:38 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:42007 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729019AbfJMXch (ORCPT ); Sun, 13 Oct 2019 19:32:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46ryf92ntPz9sPK; Mon, 14 Oct 2019 10:32:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1571009554; bh=fG65Ou9hm6jAUtZ1jr/a0UpxaBAsfjL9JB3XGBZLdjA=; h=Date:From:To:Cc:Subject:From; b=Ti/8B17aZkEL5saEp6dEsQYrH8OzlXxPlM9DnYHz4y8YR7f9srOmOua9Prp+rEQFE xXFf391cIkBCdDEZbq6dZGkz1rdl91wGAfrV/WanS3IMYNFKBTFE3FbgRbKr6Iyjag MCCv6y/dTh6c3GAWSN+2v7kLoZMy4/8JRXslzShUrluLj0GSvHHRLBBWR2qQZl6M+A PYuvYqdLO+DpiPCsO6N96+DDAokOt16c/qXeAEafqioU+93v3wKGm5Ctkr09AFLsxP bx2cW3tSgIyUBO0mm48pjwehJWqBOnhIM1YEKXv2HvVE9xudhtFjJHtxzjhWt4QI6v ua4nghwM66dAw== Date: Mon, 14 Oct 2019 10:32:32 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ivan Khoronzhuk , Yonghong Song Subject: linux-next: manual merge of the bpf-next tree with the net tree Message-ID: <20191014103232.09c09e53@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: tools/lib/bpf/Makefile between commit: 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a") from the net tree and commits: 5c26f9a78358 ("libbpf: Don't use cxx to test_libpf target") 793a349cd819 ("libbpf: Add C/LDFLAGS to libbpf.so and test_libpf targets") from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc tools/lib/bpf/Makefile index 56ce6292071b,75b538577c17..000000000000 --- a/tools/lib/bpf/Makefile