Hi all,
Today's linux-next merge of the ipsec-next tree got a conflict in:
net/ipv6/af_inet6.c
between commit:
3986912f6a9a ("ipv6: move SIOCADDRT and SIOCDELRT handling into
->compat_ioctl")
from the net-next tree and commit:
0146dca70b87 ("xfrm: add support for UDPv6 encapsulation of
Hi all,
Today's linux-next merge of the ipsec-next tree got a conflict in:
net/ipv4/ip_output.c
between commit:
bec1f6f69736 ("udp: generate gso with UDP_SEGMENT")
from the net-next tree and commit:
cd027a5433d6 ("udp: enable UDP checksum offload for ESP")
from the ipsec-next tree.
I
Hi Steffen,
Today's linux-next merge of the ipsec-next tree got a conflict in:
net/xfrm/xfrm_policy.c
between commit:
63fca65d0863 ("net: add confirm_neigh method to dst_ops")
from the net-next tree and commits:
3d7d25a68ea5 ("xfrm: policy: remove garbage_collect callback")
a2817d8b27
