Re: linux-next: manual merge of the kspp tree with the net-next tree

[Kees Cook <keescook@chromium.org>]

On Thu, Mar 07, 2024 at 04:29:58PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> FIXME: Add owner of second tree to To:
>        Add author(s)/SOB of conflicting commits.
> 
> Today's linux-next merge of the kspp tree got conflicts in:
> 
>   drivers/net/ethernet/intel/ice/ice_lib.c
>   drivers/net/ethernet/intel/ice/ice_xsk.c
> 
> between commits:
> 
>   3e5fb691faee ("ice: make ice_vsi_cfg_rxq() static")
>   a292ba981324 ("ice: make ice_vsi_cfg_txq() static")
> 
> from the net-next tree and commit:
> 
>   014dc22af922 ("overflow: Change DEFINE_FLEX to take __counted_by member")
> 
> from the kspp tree.
> 
> I fixed it up (I used those files from the former and applied the
> following merge fix patch) 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.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 7 Mar 2024 16:26:02 +1100
> Subject: [PATCH] fix up for "overflow: Change DEFINE_FLEX to take __counted_by
>  member"
> 
> comflcting with commits
> 
>   3e5fb691faee ("ice: make ice_vsi_cfg_rxq() static")
>   a292ba981324 ("ice: make ice_vsi_cfg_txq() static")
> 
> from the net-nect tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/ethernet/intel/ice/ice_base.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
> index d2fd315556a3..a545a7917e4f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_base.c
> +++ b/drivers/net/ethernet/intel/ice/ice_base.c
> @@ -956,7 +956,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_tx_ring *ring,
>  int ice_vsi_cfg_single_txq(struct ice_vsi *vsi, struct ice_tx_ring **tx_rings,
>  			   u16 q_idx)
>  {
> -	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);
> +	DEFINE_RAW_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);
>  
>  	if (q_idx >= vsi->alloc_txq || !tx_rings || !tx_rings[q_idx])
>  		return -EINVAL;
> @@ -978,7 +978,7 @@ int ice_vsi_cfg_single_txq(struct ice_vsi *vsi, struct ice_tx_ring **tx_rings,
>  static int
>  ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_tx_ring **rings, u16 count)
>  {
> -	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);
> +	DEFINE_RAW_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);
>  	int err = 0;
>  	u16 q_idx;

Thanks! This looks correct to me.

-- 
Kees Cook