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

[Stephen Rothwell]

Hi all,

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

  net/xdp/xsk.c

between commit:

  3c5b4d69c358 ("net: annotate data-races around sk->sk_mark")

from the net tree and commit:

  b7f72a30e9ac ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path")

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/xsk.c
index b89adb52a977,4f1e0599146e..000000000000
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@@ -505,11 -682,22 +682,22 @@@ static struct sk_buff *xsk_build_skb(st
  
  	skb->dev = dev;
  	skb->priority = xs->sk.sk_priority;
 -	skb->mark = xs->sk.sk_mark;
 +	skb->mark = READ_ONCE(xs->sk.sk_mark);
- 	skb_shinfo(skb)->destructor_arg = (void *)(long)desc->addr;
  	skb->destructor = xsk_destruct_skb;
+ 	xsk_set_destructor_arg(skb);
  
  	return skb;
+ 
+ free_err:
+ 	if (err == -EAGAIN) {
+ 		xsk_cq_cancel_locked(xs, 1);
+ 	} else {
+ 		xsk_set_destructor_arg(skb);
+ 		xsk_drop_skb(skb);
+ 		xskq_cons_release(xs->tx);
+ 	}
+ 
+ 	return ERR_PTR(err);
  }
  
  static int __xsk_generic_xmit(struct sock *sk)

Attachment: pgp2cP3c7ZTQp.pgp
Description: OpenPGP digital signature