linux-next: manual merge of the ipsec tree with Linus' tree

linux-next: manual merge of the ipsec tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Hi Steffen,

Today's linux-next merge of the ipsec tree got a conflict in
net/ipv4/ip_vti.c between commit 8d89dcdf80d8 ("vti: don't allow to add
the same tunnel twice") from Linus' tree and commit a32452366b72 ("vti4:
Don't count header length twice") from the ipsec tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/ip_vti.c
index afcee51b90ed,cd62596e9a87..000000000000
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@@ -349,7 -348,7 +349,6 @@@ static int vti_tunnel_init(struct net_d
  	memcpy(dev->dev_addr, &iph->saddr, 4);
  	memcpy(dev->broadcast, &iph->daddr, 4);
  
- 	dev->hard_header_len	= LL_MAX_HEADER + sizeof(struct iphdr);
 -	dev->type		= ARPHRD_TUNNEL;
  	dev->mtu		= ETH_DATA_LEN;
  	dev->flags		= IFF_NOARP;
  	dev->iflink		= 0;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the ipsec tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

Hi all,

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

  net/ipv6/Kconfig

between commit:

  a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'")

from Linus' tree and commits:

  7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections")
  be01369859b8 ("esp, ah: modernize the crypto algorithm selections")

from the ipsec 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]