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_HELO_NONE, SPF_PASS 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 470DFC28CC5 for ; Thu, 6 Jun 2019 01:35:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12A642083E for ; Thu, 6 Jun 2019 01:35:00 +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="W57XLFxZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726697AbfFFBe7 (ORCPT ); Wed, 5 Jun 2019 21:34:59 -0400 Received: from ozlabs.org ([203.11.71.1]:41939 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726581AbfFFBe6 (ORCPT ); Wed, 5 Jun 2019 21:34:58 -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 45K7WL63NCz9s4Y; Thu, 6 Jun 2019 11:34:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1559784895; bh=k4EAmrNeiqAHWysyg68/7k/hn4qeEy3U/RBjhZrfVFs=; h=Date:From:To:Cc:Subject:From; b=W57XLFxZjB0pcqNCK4HC8ScQt+iVCbcGfqBN3pZLPVgwYgrg4wHnSO5rHw64GYVsQ kxjn6yBqgpKF0uU+y6pevfaN4XbUbXNK5qWKKTZhdQIQTT5w0Z6fnmaRZRp2XM0U9z pJnMNU5c3KilYAbYF7fB/Zd08Pp5t+egXzOlQ1j/MnKM8+aEjJuMmXPKkHzzx7zM3z SJfYgt/b6BRtYIHImX1mOUX2ba30n3Aq7NAMoObGqMxRM9b3rtbdWnOmfwEATkOx/T L1TvzHMkyOb/yZx/P/6eewAzmCO1GR28EZr1jSnUYpyBeuzLrcYelFlB3vFrrLPMyE E0Zu4EX6AZJ9w== Date: Thu, 6 Jun 2019 11:34:37 +1000 From: Stephen Rothwell To: David Miller , Networking , Daniel Borkmann , Alexei Starovoitov Cc: Linux Next Mailing List , Linux Kernel Mailing List , Hangbin Liu , Andrii Nakryiko Subject: linux-next: manual merge of the net-next tree with the bpf tree Message-ID: <20190606113437.7d5bb929@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/iKHmU36oxS/Xg5SYhaFXmoo"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/iKHmU36oxS/Xg5SYhaFXmoo Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: tools/testing/selftests/bpf/Makefile between commit: 25a7991c84f6 ("selftests/bpf: move test_lirc_mode2_user to TEST_GEN_PROGS= _EXTENDED") from the bpf tree and commit: 2d2a3ad872f8 ("selftests/bpf: add btf_dump BTF-to-C conversion tests") from the net-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/testing/selftests/bpf/Makefile index e36356e2377e,2b426ae1cdc9..000000000000 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@@ -21,9 -23,10 +23,10 @@@ LDLIBS +=3D -lcap -lelf -lrt -lpthrea # Order correspond to 'make run_tests' order TEST_GEN_PROGS =3D test_verifier test_tag test_maps test_lru_map test_lpm= _map test_progs \ test_align test_verifier_log test_dev_cgroup test_tcpbpf_user \ - test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ - test_cgroup_storage test_select_reuseport test_section_names \ - test_netcnt test_tcpnotify_user test_sock_fields test_sysctl - test_sock test_btf test_sockmap test_lirc_mode2_user get_cgroup_id_user \ ++ test_sock test_btf test_sockmap get_cgroup_id_user \ + test_socket_cookie test_cgroup_storage test_select_reuseport test_sectio= n_names \ + test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashma= p \ + test_btf_dump test_cgroup_attach xdping =20 BPF_OBJ_FILES =3D $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES =3D $(BPF_OBJ_FILES) --Sig_/iKHmU36oxS/Xg5SYhaFXmoo Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlz4ba0ACgkQAVBC80lX 0GyHbAgAln49vKCDkQ3VGwN1IIYxfXnotkYxdi5uixRZJfmjdnhHpc2VWQsb8uYJ ui7lrin0L9RkWcdrxkr3jfQqBvD89Vqu+BXdijfkQoXR2vdxWHbN0VRcLJc9+ZV8 ZDuCUiVcWfJPM06vJnqqpaUdq+sHp7lKnerrfGXxkoK64r76tFIJ5+Ca9Zta2wR5 u1wLVwRfzQX/fsbulIzrr44+4e5NAC1gjS9VFju1QZe+Wzkl7nO3JCR9D5NlDuOt Z63noy2gUY2pShCUW5Rzl7F7WW9Y2RhokXVUOUSuRiklt8OhC9WlsSVhvaXW/HLO uiuELnaaxAjULvPns+03BrZwWxYw9w== =tqUs -----END PGP SIGNATURE----- --Sig_/iKHmU36oxS/Xg5SYhaFXmoo--