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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Jul 2020 12:16:30 +1000

Hi all,

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

  include/net/xdp.h

between commit:

  2f0bc54ba9a8 ("xdp: introduce xdp_get_shared_info_from_{buff, frame} utility routines")

from the net-next tree and commits:

  9216477449f3 ("bpf: cpumap: Add the possibility to attach an eBPF program to cpumap")
  28b1520ebf81 ("bpf: cpumap: Implement XDP_REDIRECT for eBPF programs attached to map entries")

from the bpf-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 include/net/xdp.h
index d3005bef812f,5be0d4d65b94..000000000000
--- a/include/net/xdp.h
+++ b/include/net/xdp.h
@@@ -104,15 -98,12 +104,21 @@@ struct xdp_frame 
  	struct net_device *dev_rx; /* used by cpumap */
  };
  
 +static inline struct skb_shared_info *
 +xdp_get_shared_info_from_frame(struct xdp_frame *frame)
 +{
 +	void *data_hard_start = frame->data - frame->headroom - sizeof(*frame);
 +
 +	return (struct skb_shared_info *)(data_hard_start + frame->frame_sz -
 +				SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
 +}
 +
+ struct xdp_cpumap_stats {
+ 	unsigned int redirect;
+ 	unsigned int pass;
+ 	unsigned int drop;
+ };
+ 
  /* Clear kernel pointers in xdp_frame */
  static inline void xdp_scrub_frame(struct xdp_frame *frame)
  {