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 ESP")
from the ipsec-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/ipv6/af_inet6.c
index b69496eaf922,aa4882929fd0..000000000000
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@@ -60,7 -60,7 +60,8 @@@
#include <net/calipso.h>
#include <net/seg6.h>
#include <net/rpl.h>
+#include <net/compat.h>
+ #include <net/xfrm.h>
#include <linux/uaccess.h>
#include <linux/mroute6.h>
Attachment:
pgppbsvhAg5ZD.pgp
Description: OpenPGP digital signature
