Merge remote-tracking branch 'ipsec-next/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)
diff --cc net/ipv4/esp4.c
Simple merge
diff --cc net/ipv6/ah6.c
Simple merge
diff --cc net/ipv6/esp6.c
Simple merge
diff --cc net/ipv6/esp6_offload.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)
		1	2
net/ipv4/esp4.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/ah6.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/esp6.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/esp6_offload.c	patch \|	diff1 \|	diff2 \|	blob \| history