Received-SPF: pass (google.com: domain of linux-kernel+bounces-17360-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 5 Jan 2024 11:55:09 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Michael Chan <michael.chan@broadcom.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20240105115509.225aa8a2@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/rt2RrppPJEEeCHLheu3xs91";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/rt2RrppPJEEeCHLheu3xs91
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/broadcom/bnxt/bnxt.c

between commit:

  e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters=
()")

from the net tree and commit:

  0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index e1f1e646cf48,8f10ab4d4a43..000000000000
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -13081,30 -14088,18 +14090,16 @@@ static void bnxt_cfg_ntp_filters(struc
  				if (rc)
  					del =3D true;
  				else
- 					set_bit(BNXT_FLTR_VALID, &fltr->state);
+ 					set_bit(BNXT_FLTR_VALID, &fltr->base.state);
  			}
 =20
- 			if (del) {
- 				spin_lock_bh(&bp->ntp_fltr_lock);
- 				hlist_del_rcu(&fltr->hash);
- 				bp->ntp_fltr_count--;
- 				spin_unlock_bh(&bp->ntp_fltr_lock);
- 				synchronize_rcu();
- 				clear_bit(fltr->sw_id, bp->ntp_fltr_bmap);
- 				kfree(fltr);
- 			}
+ 			if (del)
+ 				bnxt_del_ntp_filter(bp, fltr);
  		}
  	}
 -	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))
 -		netdev_info(bp->dev, "Receive PF driver unload event!\n");
+ #endif
  }
 =20
- #else
-=20
- static void bnxt_cfg_ntp_filters(struct bnxt *bp)
- {
- }
-=20
- #endif /* CONFIG_RFS_ACCEL */
-=20
  static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned i=
nt table,
  				    unsigned int entry, struct udp_tunnel_info *ti)
  {

--Sig_/rt2RrppPJEEeCHLheu3xs91
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWXU20ACgkQAVBC80lX
0Gwg/Qf9GX4MQ+uLcAc+deNFVMi7ZVCclDpzYzXt8kGQN10cSdXeLVRvozjzWIfT
ZU+SULmostQaubrPXSlb/7tyAsU/+sRkvUe3+z1llmaWdPaaHuCzaoi6BBuuTWYh
tq3s/osd+e/82/DG5tM54NBvuLH0sCsUttlyNNue7MsbGIcPyTljtTTp8yPltc23
mOmBZKjjXIBhN33vUN5ZswsduE2P4Gj8elSm2UbD7cObPXi/5BhLLYxtQdo/9ug0
e4K8HE4dXUY/kXvYhETE0q/ECn7ismKt4lQKme6L6oAY+cb7vMC2s5mde5QQxfSo
a5tJVGGrgzxQQ/dFop1Ey2hVjcrvrA==
=4a2U
-----END PGP SIGNATURE-----

--Sig_/rt2RrppPJEEeCHLheu3xs91--