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 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 64917C43387 for ; Thu, 20 Dec 2018 02:07:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E3AD20866 for ; Thu, 20 Dec 2018 02:07:50 +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="YbV2ktUZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729915AbeLTCHs (ORCPT ); Wed, 19 Dec 2018 21:07:48 -0500 Received: from ozlabs.org ([203.11.71.1]:51397 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727850AbeLTCHs (ORCPT ); Wed, 19 Dec 2018 21:07:48 -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 43KwBn10kmz9sCh; Thu, 20 Dec 2018 13:07:45 +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=1545271665; bh=ALJlFJbVGlIXLYaNyYx5K2yp9yZcxr2p2rq543Rr1FI=; h=Date:From:To:Cc:Subject:From; b=YbV2ktUZ+yswMSPECrA9ytrP15COEkW95OMgbywworUCi96BfM0qcGi97L5lYXYHR +RwK/gAOnyskkEgVy2NuzmG+ubnsPm0XbV74TAZLutkls5oqgDSsSaQ/oIcoE+Cesj PyL6E8mtfNyD3NgbUikFJzhkH4aaO9wG81Kc6y+poyyRhyIIiuzGRHRnT2DLrMqI+p +yO97r6NbdKrOdsdmst7WrCa0/1vpyD+FhPebm4pTpkUtEDpgkxTL8P7SLxNf4DY0y Q9TNb/kDQT9jr+3pXr26W+YkIc8HcE776g6D9PxP7kgFBWHXvvmvZx13okB/2Ly9Qj nQXjEkxeJxRJw== Date: Thu, 20 Dec 2018 13:07:44 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Gavi Teitz , Or Gerlitz , Saeed Mahameed Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20181220130744.1c8db488@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/nX28Uvr9Sab4uT5+YhSOABB"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/nX28Uvr9Sab4uT5+YhSOABB 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: drivers/net/ethernet/mellanox/mlx5/core/en_rep.c between commit: 8956f0014ea5 ("net/mlx5e: Fix default amount of channels for VF represent= ors") from the net tree and commit: d9ee0491c2ff ("net/mlx5e: Use dedicated uplink vport netdev representor") from the net-next tree. I fixed it up (I just used the net-next tree version) 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_/nX28Uvr9Sab4uT5+YhSOABB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwa+XAACgkQAVBC80lX 0GxG6gf/RJAlX3eVz1oSmdp7VgDiJnlMtz7PpEm47mTpATHVZkJ1FXgv+1ha80Hj h9EtQ4HVWjDYERs8tZz60VI5UbK8Bzbnl0RN1FZ/i/ZiBwzhl42QRisR7TNBhNF3 Hmi0DbjtRKF7UPwJbgJU4MIAvjAwX+MbTjd2Hu66outvpfkXXtP9V2uUDa6wFTNI tBRvcgRMZhPbqeRocsfrpKTuCCwlUzq+gRIsW/8Qu+f2sDy9vxiW+8pZZ7h3vNHq 43ctfSZ145ELaeAqD6TcXPVESuKWb31maIbVQQIPSMOBndp7gqT6cXZWJn8b1nT/ IEZ/VoIrB4ZldUlPxHx8bzLXmh6hRQ== =k3I5 -----END PGP SIGNATURE----- --Sig_/nX28Uvr9Sab4uT5+YhSOABB--