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=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED 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 DBE94C43381 for ; Tue, 26 Mar 2019 22:14:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5E2C20811 for ; Tue, 26 Mar 2019 22:14:47 +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="sLhYgNTU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731840AbfCZWOq (ORCPT ); Tue, 26 Mar 2019 18:14:46 -0400 Received: from ozlabs.org ([203.11.71.1]:47521 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725962AbfCZWOq (ORCPT ); Tue, 26 Mar 2019 18:14:46 -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 44TQR71KW3z9sTV; Wed, 27 Mar 2019 09:14:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1553638483; bh=RRWHugjAvABGfdtA1SghFKrDRRJZWP8Czl2vUQk/R4s=; h=Date:From:To:Cc:Subject:From; b=sLhYgNTURVyPohYKpuU0OT73LbYrVBssBXDyK7NR8sNjRzj++dSxP6yy48WnR55In tBxuHNjZx+bbdCUdObxWUnfR9XIT9fQf8Zl6L3MTOr5SnccKHoXFnYq6jtpKXV3Fh6 arzKJwJd/IuewBeJ63zozWF9XhkeOP/zX2/NANZFxCJwTtMN8ro+CxX38yEypTMLBv ofsQUuw1b5dCyNxY7F5tbMZZxtxmfJe0TVFF8Sfw9S1ltFm468HWV7WB2kogYCesrP CgR9d+omOE736EOgihPiU7Oi5RjxNsEaxoJrhtjmP86q+LdUJ5/6sTkn7JUfTmncf2 rmGY9p4KCV+fw== Date: Wed, 27 Mar 2019 09:14:37 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking , David Miller Cc: Linux Next Mailing List , Linux Kernel Mailing List , Luca Boccassi Subject: linux-next: manual merge of the bpf-next tree with the net tree Message-ID: <20190327091437.68ec6903@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/RzM0gbDkZ=flEpOJ8zcbFAU"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/RzM0gbDkZ=flEpOJ8zcbFAU 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: 1d382264d911 ("bpf, libbpf: fix version info and add it to shared object") from the net tree and commit: 60e4786e229d ("tools/bpf: generate pkg-config file for libbpf") 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 5bf8e52c41fc,96e9571b0a2e..000000000000 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@@ -79,6 -79,9 +79,8 @@@ export prefix libdir src ob libdir_SQ =3D $(subst ','\'',$(libdir)) libdir_relative_SQ =3D $(subst ','\'',$(libdir_relative)) =20 -LIB_FILE =3D libbpf.a libbpf.so + PC_FILE =3D libbpf.pc +=20 VERSION =3D $(BPF_VERSION) PATCHLEVEL =3D $(BPF_PATCHLEVEL) EXTRAVERSION =3D $(BPF_EXTRAVERSION) @@@ -129,18 -129,17 +131,19 @@@ all export srctree OUTPUT CC LD CFLAGS V include $(srctree)/tools/build/Makefile.include =20 -BPF_IN :=3D $(OUTPUT)libbpf-in.o -LIB_FILE :=3D $(addprefix $(OUTPUT),$(LIB_FILE)) -PC_FILE :=3D $(addprefix $(OUTPUT),$(PC_FILE)) -VERSION_SCRIPT :=3D libbpf.map +BPF_IN :=3D $(OUTPUT)libbpf-in.o +VERSION_SCRIPT :=3D libbpf.map + +LIB_TARGET :=3D $(addprefix $(OUTPUT),$(LIB_TARGET)) +LIB_FILE :=3D $(addprefix $(OUTPUT),$(LIB_FILE)) ++PC_FILE :=3D $(addprefix $(OUTPUT),$(PC_FILE)) =20 GLOBAL_SYM_COUNT =3D $(shell readelf -s --wide $(BPF_IN) | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {s++} END{print s}') VERSIONED_SYM_COUNT =3D $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) =20 - CMD_TARGETS =3D $(LIB_TARGET) -CMD_TARGETS =3D $(LIB_FILE) $(PC_FILE) ++CMD_TARGETS =3D $(LIB_TARGET) $(PC_FILE) =20 CXX_TEST_TARGET =3D $(OUTPUT)test_libbpf =20 @@@ -233,7 -232,7 +247,7 @@@ config-clean =20 clean: $(call QUIET_CLEAN, libbpf) $(RM) $(TARGETS) $(CXX_TEST_TARGET) \ - *.o *~ *.a *.so *.so.$(VERSION) .*.d .*.cmd LIBBPF-CFLAGS - *.o *~ *.a *.so .*.d .*.cmd *.pc LIBBPF-CFLAGS ++ *.o *~ *.a *.so *.so.$(VERSION) .*.d .*.cmd *.pc LIBBPF-CFLAGS $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf =20 =20 --Sig_/RzM0gbDkZ=flEpOJ8zcbFAU Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlyapE0ACgkQAVBC80lX 0GygTwf/Yo93YhpDOnBpP6Jr/rRoDsdFBnN4ttOr7s+hO2uOSBEXzjq3EfSkcsHk tfoAL6rssj+i6zIzMjhu8X+WQwAg85K/x/vAQ8ZGAQ7TcbAaPWCXmofoEvrEYr9f 34skN4q2X0A+BRHFjAdLEpkAGC1ETivZYJdQxUV2J1mvP/Vb25aqX2Jnt5YueC+O m3vBrf7Ck0cYYoSUgcErw6G5Y5V4vK5bzRYgkbAu90tCYMa6n67zpivT7m7PiGFE jt8xWQ8+WRMbLBZZ+dOiG2OgrPDXB9GseZJnD6hixx/lkIPa+oTSISjCdJHIklAZ JdE0yuDpQROfr5SMUglkc5c9cmvJbQ== =klIF -----END PGP SIGNATURE----- --Sig_/RzM0gbDkZ=flEpOJ8zcbFAU--