From patchwork Thu Apr 8 02:49:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12189881 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=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 D7BA1C433B4 for ; Thu, 8 Apr 2021 02:49:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A299A61157 for ; Thu, 8 Apr 2021 02:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbhDHCuH (ORCPT ); Wed, 7 Apr 2021 22:50:07 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:42877 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbhDHCuF (ORCPT ); Wed, 7 Apr 2021 22:50:05 -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 4FG5Mh2YWjz9sWC; Thu, 8 Apr 2021 12:49:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617850193; bh=tFrRRUHWBWHDMHiksNGUJeEfJl/zE07+4IvQbpl0H5E=; h=Date:From:To:Cc:Subject:From; b=sHG3bdgtRJnuHGRBUZBs3U7zD5OpJy8cU+hteUtLSANc3HepQXAedzGghdxzyuDY+ DNj8/oP70hZygW6/ydgLcWcQRfsafzQ5U5edEYrEXfAiVq6lmnd8u/GfFvxIPwZCPF JxFPTK8IWa81jUy4Kl1eVPC+AmCVRyxgpQj+qUCrVhuci7S0R0+U3coMAfQ6GRPH1v ZJ0Ide439pFiaou16126TS/uAZu9XVSDda7YEhOfKKQCXxDD2YFegd61awYU/uPgh8 XaXaDJl5tjE5iNXRDUzB3COtdqWLaSPQhNpMh1u3fqbCZhleSAx2QIOFKdsbvZpXdh ndq19E5glRs6A== Date: Thu, 8 Apr 2021 12:49:51 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Alexander Duyck , Danielle Ratson , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20210408124951.2f9941e6@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: include/linux/ethtool.h between commit: a975d7d8a356 ("ethtool: Remove link_mode param and derive link params from driver") from the net tree and commit: 7888fe53b706 ("ethtool: Add common function for filling out strings") 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 include/linux/ethtool.h index cdca84e6dd6b,5c631a298994..000000000000 --- a/include/linux/ethtool.h