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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 5 Jan 2024 11:55:09 +1100

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.

-- 
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 = true;
  				else
- 					set_bit(BNXT_FLTR_VALID, &fltr->state);
+ 					set_bit(BNXT_FLTR_VALID, &fltr->base.state);
  			}
  
- 			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
  }
  
- #else
- 
- static void bnxt_cfg_ntp_filters(struct bnxt *bp)
- {
- }
- 
- #endif /* CONFIG_RFS_ACCEL */
- 
  static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,
  				    unsigned int entry, struct udp_tunnel_info *ti)
  {