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.8 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 C44D5C48BD7 for ; Thu, 27 Jun 2019 04:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 933BF20989 for ; Thu, 27 Jun 2019 04:09:34 +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="tvHKF0SW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726497AbfF0EJe (ORCPT ); Thu, 27 Jun 2019 00:09:34 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:45277 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725850AbfF0EJe (ORCPT ); Thu, 27 Jun 2019 00:09:34 -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 45Z5y20RXPz9s8m; Thu, 27 Jun 2019 14:09:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561608570; bh=LsIp4MOsb8p6EEYoMgfZs22cxz+dk7gDFUx8sf0mkdA=; h=Date:From:To:Cc:Subject:From; b=tvHKF0SWsqwGEv/46sF7wh4vP029CvmQW0vg5RmUfVA4aeL0dkUzGtiN/nm9IV7wu 84mqme1tU6L89lGBH+BtsVLkjwuistEMh+PzFOlmAp1DQiPGfYvEmNiBWsjRN/040E 0yWeYZYEt/G9EznXy6uv/3SuOimWwiHo04Szbt1hVP3Ol662YPvnUz6kVkK68vbshH jMeYL1h6ehgi+A531naEh2ZzSbiidC+sVvzxrYKbT27Ap1+ElWVPefE5WzPwzUOcYb p6V6crluP5IoMaQqVa4Z2Ase0ieS2GEmlRK4o3+aIov8bv5hj+7ZHMP/9gfycqqhdK WbgnmbpYjXc5Q== Date: Thu, 27 Jun 2019 14:09:29 +1000 From: Stephen Rothwell To: Leon Romanovsky , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Yevgeny Kliteynik , Saeed Mahameed , Eli Britstein , Jianbo Liu Subject: linux-next: manual merge of the mlx5-next tree with the net-next tree Message-ID: <20190627140929.74ae7da6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/QoQkQBfE9+wL/NEtPF.A9T8"; protocol="application/pgp-signature" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/QoQkQBfE9+wL/NEtPF.A9T8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the mlx5-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c between commits: 955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configurat= ion") d4a18e16c570 ("net/mlx5e: Enable setting multiple match criteria for flow= group") from the net-next tree and commits: 7445cfb1169c ("net/mlx5: E-Switch, Tag packet with vport number in VF vpo= rts and uplink ingress ACLs") c01cfd0f1115 ("net/mlx5: E-Switch, Add match on vport metadata for rule i= n fast path") from the mlx5-next tree. I fixed it up (I basically used the latter versions) 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 --Sig_/QoQkQBfE9+wL/NEtPF.A9T8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0UQXkACgkQAVBC80lX 0GwLEgf/bVWJXuP70coqS1/vunI8Z7J7mRV2/FWSXyVt6F/eBGOUYxNgZdUmn+Sd lHke3vl4fFHUI0JqVNvrnOYbAxTBaPsZFFtdyRAzMrzs8ZCKKzyYRvAzCRyvcvl/ lURKaUAL1Oj0OvEU1Eyl+lBbArTcpc16WhhPcSys3mMNmgLwhqkGJ68rry/xKOo2 oTb7smt/wAvmVqxV4RHvLILM+fXFI4q48MZEociyPn5L3wZyouk1mQe8XM20J2Al YdJXsaTZXotWVd3I1sa7O2RiK6i4lN1RHoIU8rYmwnwBbE8hYcj7iMTNijlbIliV SRPXhdxnmk28cDkEWD3qiMSrq9+Tfg== =DxZn -----END PGP SIGNATURE----- --Sig_/QoQkQBfE9+wL/NEtPF.A9T8--