From patchwork Sun Oct 17 23:52:46 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12564711
X-Patchwork-Delegate: kuba@kernel.org
Return-Path: <netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 1F61FC433EF
	for <netdev@archiver.kernel.org>; Sun, 17 Oct 2021 23:52:52 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id F35DD6124B
	for <netdev@archiver.kernel.org>; Sun, 17 Oct 2021 23:52:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1344794AbhJQXzA (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Sun, 17 Oct 2021 19:55:00 -0400
Received: from gandalf.ozlabs.org ([150.107.74.76]:33697 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S232246AbhJQXzA (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sun, 17 Oct 2021 19:55:00 -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 4HXcJH71nHz4xbb;
        Mon, 18 Oct 2021 10:52:47 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1634514768;
        bh=Z12/LzqRnTuMa2K3hnOVJnRq+Am1J+wCD4czDVuOD7M=;
        h=Date:From:To:Cc:Subject:From;
        b=IxxTqJTLVQ27rAafX7YDlfpCawNB5LnJTAjMPtZ4+Lj1iKayXEdjpqyBnfVygHvuq
         Mm0Koh9FFadD02wk6lFitDVo1u//tczX2qoBgMRR2HJ/ZFAaTVnO8SrkbPWpWJ07Eb
         AZInpBHuvcoemvN7JiFSBiFqrHq/v9+Pawellh8rDut+YtyPVVq80NppBWSVAH8o9n
         80MfgJCbZgdvK96fg+0lRluyyhDLDsN5GIi+znQollXavN+T7oxINYybHML4keDYka
         RK2/u37XZXIEfYzO3TsyrS1N8+D5CCfY+IVTVexkmb4r5qIjomSsHisVc7gQxmYpSS
         Eyt5ZtfKsrESA==
Date: Mon, 18 Oct 2021 10:52:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Brett Creeley <brett.creeley@intel.com>,
        Jacob Keller <jacob.e.keller@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tony Nguyen <anthony.l.nguyen@intel.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20211018105246.13d388b0@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
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/intel/ice/ice_devlink.c

between commit:

  b726ddf984a5 ("ice: Print the api_patch as part of the fw.mgmt.api")

from the net tree and commit:

  0128cc6e928d ("ice: refactor devlink getter/fallback functions to void")

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/intel/ice/ice_devlink.c
index da7288bdc9a3,55353bf4cbef..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_devlink.c