From patchwork Tue Apr 6 03:49:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12184121 X-Patchwork-Delegate: kuba@kernel.org 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 EB71FC433B4 for ; Tue, 6 Apr 2021 03:49:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAE98611EE for ; Tue, 6 Apr 2021 03:49:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243573AbhDFDtZ (ORCPT ); Mon, 5 Apr 2021 23:49:25 -0400 Received: from ozlabs.org ([203.11.71.1]:39571 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233639AbhDFDtY (ORCPT ); Mon, 5 Apr 2021 23:49:24 -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 4FDtn65N4Wz9sSC; Tue, 6 Apr 2021 13:49:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617680955; bh=2V41qytuS/O/lB46Y0+hixtZSve/HcH+r1+SdAlGDyw=; h=Date:From:To:Cc:Subject:From; b=bWEpKd1FZXu/0BmAT35fkgGDNFerfySzMTlXhSa2aR2h5EWchEBlFjdonYv0Pu0z1 IqK2tWoENJaoZxbkwNkGJJCZQ6WQf+C/1waNyskqdADwjOOd6aGOY8tqM+dvYqJnG0 kc3uFMdWCaepdIUdClsVQ0SMNpYgnhWfTcnWRU5OK+pTO27iKETZK+IjQ5YB8zJTcg 7rwE8D0aKSIC4QlDvwRyd3ioGsmiuTMMWvBdn5sPu7NQ8KOJz+ngOEp3R9nK+Yz+zW bAPuki2Hcw5elikCVp52nKb2Yju8i6aeZGFIQwwcfFbxW3Y7tDQbj73ieqvee46P+A uZy+e4CDz9vQQ== Date: Tue, 6 Apr 2021 13:49:12 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Roi Dayan , Saeed Mahameed , Tariq Toukan Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20210406134912.6a37cdcd@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/en_main.c between commit: 3ff3874fa0b2 ("net/mlx5e: Guarantee room for XSK wakeup NOP on async ICOSQ") from the net tree and commits: c276aae8c19d ("net/mlx5: Move mlx5e hw resources into a sub object") b3a131c2a160 ("net/mlx5e: Move params logic into its dedicated file") 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. diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 5db63b9f3b70,773449c1424b..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c