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

[Mark Brown]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

between commit:

  db25c42c2e1f9 ("net/mlx5e: RX, Fix XDP multi-buf frag counting for striding RQ")

from the net tree and commit:

  dff1c3164a692 ("net/mlx5e: SHAMPO, Always calculate page size")

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/mellanox/mlx5/core/en_rx.c
index 268e208847577,8fb57a4f36dd8..0000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@@ -1971,12 -1977,13 +1973,12 @@@ mlx5e_skb_from_cqe_mpwrq_nonlinear(stru
  			return NULL; /* page/packet was consumed by XDP */
  		}
  
 -		nr_frags_free = old_nr_frags - sinfo->nr_frags;
 -		if (unlikely(nr_frags_free)) {
 -			frag_page -= nr_frags_free;
 +		new_nr_frags = sinfo->nr_frags;
 +		nr_frags_free = old_nr_frags - new_nr_frags;
 +		if (unlikely(nr_frags_free))
- 			truesize -= (nr_frags_free - 1) * PAGE_SIZE +
+ 			truesize -= (nr_frags_free - 1) * page_size +
  				ALIGN(pg_consumed_bytes,
  				      BIT(rq->mpwqe.log_stride_sz));
 -		}
  
  		len = mxbuf->xdp.data_end - mxbuf->xdp.data;

Attachment: signature.asc
Description: PGP signature