Hi all,

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

  net/xdp/xdp_umem.c

between commit:

  b16a87d0aef7 ("xsk: Add overflow check for u64 division, stored into u32")

from the bpf tree and commit:

  2b43470add8c ("xsk: Introduce AF_XDP buffer allocation API")

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 net/xdp/xdp_umem.c
index 3889bd9aec46,19e59d1a5e9f..000000000000
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@@ -389,13 -349,10 +353,10 @@@ static int xdp_umem_reg(struct xdp_ume
  	if (headroom >= chunk_size - XDP_PACKET_HEADROOM)
  		return -EINVAL;
  
- 	umem->address = (unsigned long)addr;
- 	umem->chunk_mask = unaligned_chunks ? XSK_UNALIGNED_BUF_ADDR_MASK
- 					    : ~((u64)chunk_size - 1);
  	umem->size = size;
  	umem->headroom = headroom;
- 	umem->chunk_size_nohr = chunk_size - headroom;
+ 	umem->chunk_size = chunk_size;
 -	umem->npgs = size / PAGE_SIZE;
 +	umem->npgs = (u32)npgs;
  	umem->pgs = NULL;
  	umem->user = NULL;
  	umem->flags = mr->flags;