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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 DEB27C4CECE for ; Sun, 13 Oct 2019 23:32:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE19F206A3 for ; Sun, 13 Oct 2019 23:32:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ti/8B17a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729505AbfJMXci (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 Content-Type: multipart/signed; boundary="Sig_/wKJadKK/Yc8r5GG_iLfs8p6"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/wKJadKK/Yc8r5GG_iLfs8p6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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. --=20 Cheers, Stephen Rothwell diff --cc tools/lib/bpf/Makefile index 56ce6292071b,75b538577c17..000000000000 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@@ -143,7 -133,9 +143,9 @@@ LIB_TARGET :=3D $(addprefix $(OUTPUT),$(L LIB_FILE :=3D $(addprefix $(OUTPUT),$(LIB_FILE)) PC_FILE :=3D $(addprefix $(OUTPUT),$(PC_FILE)) =20 + TAGS_PROG :=3D $(if $(shell which etags 2>/dev/null),etags,ctags) +=20 -GLOBAL_SYM_COUNT =3D $(shell readelf -s --wide $(BPF_IN) | \ +GLOBAL_SYM_COUNT =3D $(shell readelf -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \ sort -u | wc -l) @@@ -165,7 -149,7 +159,7 @@@ all: fixde =20 all_cmd: $(CMD_TARGETS) check =20 - $(BPF_IN_SHARED): force elfdep bpfdep -$(BPF_IN): force elfdep bpfdep bpf_helper_defs.h ++$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/lin= ux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.= h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' dif= fers from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true @@@ -181,24 -165,26 +175,29 @@@ @(test -f ../../include/uapi/linux/if_xdp.h -a -f ../../../include/uapi/= linux/if_xdp.h && ( \ (diff -B ../../include/uapi/linux/if_xdp.h ../../../include/uapi/linux/i= f_xdp.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' = differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true - $(Q)$(MAKE) $(build)=3Dlibbpf + $(Q)$(MAKE) $(build)=3Dlibbpf OUTPUT=3D$(SHARED_OBJDIR) CFLAGS=3D"$(CFLA= GS) $(SHLIB_FLAGS)" + +$(BPF_IN_STATIC): force elfdep bpfdep + $(Q)$(MAKE) $(build)=3Dlibbpf OUTPUT=3D$(STATIC_OBJDIR) =20 + bpf_helper_defs.h: $(srctree)/include/uapi/linux/bpf.h + $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header \ + --file $(srctree)/include/uapi/linux/bpf.h > bpf_helper_defs.h +=20 $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION) =20 -$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN) +$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN_SHARED) - $(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION= ) \ - -Wl,--version-script=3D$(VERSION_SCRIPT) $^ -lelf -o $@ + $(QUIET_LINK)$(CC) $(LDFLAGS) \ + --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \ + -Wl,--version-script=3D$(VERSION_SCRIPT) $^ -lelf -o $@ @ln -sf $(@F) $(OUTPUT)libbpf.so @ln -sf $(@F) $(OUTPUT)libbpf.so.$(LIBBPF_MAJOR_VERSION) =20 -$(OUTPUT)libbpf.a: $(BPF_IN) +$(OUTPUT)libbpf.a: $(BPF_IN_STATIC) $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ =20 - $(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a - $(QUIET_LINK)$(CXX) $(INCLUDES) $^ -lelf -o $@ + $(OUTPUT)test_libbpf: test_libbpf.c $(OUTPUT)libbpf.a + $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $^ -lelf -o $@ =20 $(OUTPUT)libbpf.pc: $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \ @@@ -268,9 -259,9 +272,10 @@@ config-clean $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null =20 clean: - $(call QUIET_CLEAN, libbpf) $(RM) -rf $(TARGETS) $(CXX_TEST_TARGET) \ - $(call QUIET_CLEAN, libbpf) $(RM) $(CMD_TARGETS) \ ++ $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \ *.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \ - *.pc LIBBPF-CFLAGS $(SHARED_OBJDIR) $(STATIC_OBJDIR) - *.pc LIBBPF-CFLAGS bpf_helper_defs.h ++ *.pc LIBBPF-CFLAGS $(SHARED_OBJDIR) $(STATIC_OBJDIR) \ ++ bpf_helper_defs.h $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf =20 =20 --Sig_/wKJadKK/Yc8r5GG_iLfs8p6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl2jtBAACgkQAVBC80lX 0GzRXwgAisDJ6Tax2IO5Uem+ZVfGweiBNmnOSLsdTzG0guffp9WLjQg5MqDjBZLj VGKY9vojcX6gb0klbi1PXRMC0fhG17EoeEQTsBiNWwjIoqm1PCmya4NrmbxI6tLg 1RUa7Bw/HhJWB3RLEvQ4weiysjqUjz9hB8Bg1+8rQzwYYQgsEzUwewsu3YW8jl2c wCFfx3UygGMY/Msio8rVoBR9Uw7DXTNO+850L+5A50uz/VJ1cIxQkEM4vVPBTSe3 e7/W3USs4I8VQGzvbf16yE8q2Fh5ImBgGWbEP2cvEf9OEYukXbtVE0a0BQDed+nQ 4gyWa+f2CQbz8vYqdC32Hlo+P1MIxA== =4wjC -----END PGP SIGNATURE----- --Sig_/wKJadKK/Yc8r5GG_iLfs8p6--