netdev - linux-next: manual merge of the ipsec-next tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20200519132758.56a187a2@canb.auug.org.au>
Date:   Tue, 19 May 2020 13:27:58 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steffen Klassert <steffen.klassert@...unet.com>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Sabrina Dubroca <sd@...asysnail.net>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next
 tree

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>

Content of type "application/pgp-signature" skipped