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

[broonie]

Hi all,

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

  include/net/ip_tunnels.h

between commit:

  bc9d003dc48c3 ("ip_tunnel: Preserve pointer const in ip_tunnel_info_opts")

from the net-next tree and commit:

  ac931d4cdec3d ("ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices")

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.

diff --cc include/net/ip_tunnels.h
index 255b32a90850a,7912f53caae0b..0000000000000
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@@ -66,15 -73,9 +73,16 @@@ struct ip_tunnel_encap 
  #define IP_TUNNEL_OPTS_MAX					\
  	GENMASK((sizeof_field(struct ip_tunnel_info,		\
  			      options_len) * BITS_PER_BYTE) - 1, 0)
 +
 +#define ip_tunnel_info_opts(info)				\
 +	_Generic(info,						\
 +		 const struct ip_tunnel_info * : ((const void *)((info) + 1)),\
 +		 struct ip_tunnel_info * : ((void *)((info) + 1))\
 +	)
 +
  struct ip_tunnel_info {
  	struct ip_tunnel_key	key;
+ 	struct ip_tunnel_encap	encap;
  #ifdef CONFIG_DST_CACHE
  	struct dst_cache	dst_cache;
  #endif