David S. Miller 0e5f9d50ad Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec ... Steffen Klassert says: ==================== pull request (net): ipsec 2020-06-19 1) Fix double ESP trailer insertion in IPsec crypto offload if netif_xmit_frozen_or_stopped is true. From Huy Nguyen. 2) Merge fixup for "remove output_finish indirection from xfrm_state_afinfo". From Stephen Rothwell. 3) Select CRYPTO_SEQIV for ESP as this is needed for GCM and several other encryption algorithms. Also modernize the crypto algorithm selections for ESP and AH, remove those that are maked as "MUST NOT" and add those that are marked as "MUST" be implemented in RFC 8221. From Eric Biggers. Please note the merge conflict between commit: a7f7f6248d ("treewide: replace '---help---' in Kconfig files with 'help'") from Linus' tree and commits: 7d4e391959 ("esp, ah: consolidate the crypto algorithm selections") be01369859 ("esp, ah: modernize the crypto algorithm selections") from the ipsec tree. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2020-06-19 13:03:47 -07:00
..
acpi	Merge branch 'acpica'	2020-06-10 17:27:28 +02:00
asm-generic	The X86 entry, exception and interrupt code rework	2020-06-13 10:05:47 -07:00
clocksource
crypto
drm	drm/edid: Replace zero-length array with flexible-array	2020-06-15 23:08:31 -05:00
dt-bindings	- qcom :	2020-06-11 12:42:14 -07:00
keys	RxRPC: Replace zero-length array with flexible-array	2020-06-15 23:08:32 -05:00
kunit
kvm	KVM: arm64: vgic-v3: Take cpu_if pointer directly instead of vcpu	2020-05-28 11:57:10 +01:00
linux	net: core: reduce recursion limit value	2020-06-18 20:12:33 -07:00
math-emu
media	media updates for v5.8-rc1	2020-06-13 13:09:38 -07:00
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2020-06-19 13:03:47 -07:00
pcmcia
ras
rdma	dynamic_debug: add an option to enable dynamic debug for modules only	2020-06-08 11:05:56 -07:00
scsi	SCSI misc on 20200605	2020-06-05 15:11:50 -07:00
soc	pci-v5.8-changes	2020-06-06 11:01:58 -07:00
sound	ASoC: Updates for v5.8	2020-06-01 20:26:07 +02:00
target	scsi: target: Rename target_setup_cmd_from_cdb() to target_cmd_parse_cdb()	2020-06-09 21:57:26 -04:00
trace	block-5.8-2020-06-11	2020-06-11 16:07:33 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf	2020-06-17 13:26:55 -07:00
vdso
video
xen	xen: Move xen_setup_callback_vector() definition to include/xen/hvm.h	2020-06-11 15:15:19 +02:00