netdev - linux-next: manual merge of the net-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20211018105246.13d388b0@canb.auug.org.au>
Date:   Mon, 18 Oct 2021 10:52:46 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Brett Creeley <brett.creeley@...el.com>,
        Jacob Keller <jacob.e.keller@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tony Nguyen <anthony.l.nguyen@...el.com>
Subject: linux-next: manual merge of the net-next tree with the net tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/intel/ice/ice_devlink.c
index da7288bdc9a3,55353bf4cbef..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_devlink.c
+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
@@@ -63,13 -60,11 +60,11 @@@ static void ice_info_fw_api(struct ice_
  {
  	struct ice_hw *hw = &pf->hw;
  
 -	snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u",
 -		 hw->api_maj_ver, hw->api_min_ver);
 +	snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u.%u", hw->api_maj_ver,
 +		 hw->api_min_ver, hw->api_patch);
- 
- 	return 0;
  }
  
- static int ice_info_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
+ static void ice_info_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
  {
  	struct ice_hw *hw = &pf->hw;
  

Content of type "application/pgp-signature" skipped