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

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

Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)

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

Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)
diff --cc net/xfrm/xfrm_interface.c
Simple merge
diff --cc net/xfrm/xfrm_state.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Oct 2020 21:35:23 +0000 (08:35 +1100)
		1	2
net/xfrm/xfrm_interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	patch \|	diff1 \|	diff2 \|	blob \| history