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

[Mark Brown]

Hi all,

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

  net/ipv6/seg6_iptunnel.c

between commit:

  c3812651b522f ("seg6: separate dst_cache for input and output paths in seg6 lwtunnel")

from the netfilter tree and commit:

  78723a62b969a ("seg6: add per-route tunnel source address")

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 net/ipv6/seg6_iptunnel.c
index d6a0f7df90807,e76cc0cc481ec..0000000000000
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@@ -48,8 -48,8 +48,9 @@@ static size_t seg6_lwt_headroom(struct 
  }
  
  struct seg6_lwt {
 -	struct dst_cache cache;
 +	struct dst_cache cache_input;
 +	struct dst_cache cache_output;
+ 	struct in6_addr tunsrc;
  	struct seg6_iptunnel_encap tuninfo[];
  };

Attachment: signature.asc
Description: PGP signature