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 70A88C43387 for ; Thu, 20 Dec 2018 02:00:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D24220672 for ; Thu, 20 Dec 2018 02:00:45 +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="TRLW8jKN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729886AbeLTCAo (ORCPT ); Wed, 19 Dec 2018 21:00:44 -0500 Received: from ozlabs.org ([203.11.71.1]:39095 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729680AbeLTCAn (ORCPT ); Wed, 19 Dec 2018 21:00:43 -0500 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 (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43Kw2b2pPzz9sBh; Thu, 20 Dec 2018 13:00:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1545271239; bh=gl0QOC0LarYgUoWM0Og9KHQB0Zjqu70YLjURXGTEqA0=; h=Date:From:To:Cc:Subject:From; b=TRLW8jKNBjlEsuvKH7W8A0kiMLdEcieBMPmyDol59CidasxpcLAE93ZA/tzyHWRbf 6ZQYNXtojweCi8Udv0Am7S+ohGcrWfh4Nwvp8eJISz//ELixqIB0SZLgXhKHUlHzdY fNKjhAnxfeK/ObO74jKICiQJ+qPx4Oh39YV7fyFRcW+QrEcEtHFdG+W1KekaA4VFjd TFVHg+eFRwV1y5qZ2Ef4ZSygdlX3ZNOmuGESSTbDkUAa6Bsa/iScHig/FBJSArkWR+ +QnyQpNllULnUcDRh0x6Vq15S5yDlXcZysXW8ZR0Q2Y/Ow4HNrdKYDpQkdew6WLsrB 7fHBm0icXe1ow== Date: Thu, 20 Dec 2018 13:00:38 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Petr Machata , Paolo Abeni Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20181220130038.753df0d5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/npEXLpUcHsugbpdsDGuUCiw"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/npEXLpUcHsugbpdsDGuUCiw 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/net/Makefile between commit: 55cbe0794294 ("selftests: net: Add test_vxlan_fdb_changelink.sh") from the net tree and commit: e87f53b4fab7 ("selftests: add some benchmark for UDP GRO") ( and following ones) 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/net/Makefile index 923570a9708a,9543a4c2f9be..000000000000 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@@ -4,14 -4,15 +4,16 @@@ CFLAGS =3D -Wall -Wl,--no-as-needed -O2 -g CFLAGS +=3D -I../../../../usr/include/ =20 - TEST_PROGS :=3D run_netsocktests run_afpackettests test_bpf.sh netdevice.= sh rtnetlink.sh + TEST_PROGS :=3D run_netsocktests run_afpackettests test_bpf.sh netdevice.= sh \ + rtnetlink.sh xfrm_policy.sh TEST_PROGS +=3D fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_def= rag.sh TEST_PROGS +=3D udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_s= nd.sh +TEST_PROGS +=3D test_vxlan_fdb_changelink.sh + TEST_PROGS +=3D udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reusepo= rt_addr_any.sh TEST_PROGS_EXTENDED :=3D in_netns.sh TEST_GEN_FILES =3D socket - TEST_GEN_FILES +=3D psock_fanout psock_tpacket msg_zerocopy - TEST_GEN_FILES +=3D tcp_mmap tcp_inq psock_snd + TEST_GEN_FILES +=3D psock_fanout psock_tpacket msg_zerocopy reuseport_add= r_any + TEST_GEN_FILES +=3D tcp_mmap tcp_inq psock_snd txring_overwrite TEST_GEN_FILES +=3D udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag TEST_GEN_PROGS =3D reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS +=3D reuseport_dualstack reuseaddr_conflict tls --Sig_/npEXLpUcHsugbpdsDGuUCiw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwa98YACgkQAVBC80lX 0GyBywgAmHV8ZPbG0QV+24AXch5IayeUfU97UlMKAGJvi42wxJCrPUQpXaBgOl6e nIEMr/AZZUYw5BR3bbDktsFg/8A2ckKiC8ParTf6mUvcguV7JggDx5PmoUsRwyp4 CyWrUqvNndvVQ2UX+oJRGMLNoRJoSjWd9I7YGm2yS84vYLIBxB8cHassX5dg/IU9 vtdRsnYLnlVaSoxgfx0X1SApukea8nG5IdRoPW9E2kTrGkV+0nu4rgxFMrKIbHsK EOblA0Y+8b+yuRZc03DP1lsQ+nxtgx3EtIdeaF/sOD81FPrI2NDvvF7fBghjWS5X eFJIJMuMrWGmnFYVHe9MbD/A3Hlw7w== =ApKF -----END PGP SIGNATURE----- --Sig_/npEXLpUcHsugbpdsDGuUCiw--