David S. Miller f26e9b2c0b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2020-05-29 1) Add IPv6 encapsulation support for ESP over UDP and TCP. From Sabrina Dubroca. 2) Remove unneeded reference when initializing xfrm interfaces. From Nicolas Dichtel. 3) Remove some indirect calls from the state_afinfo. From Florian Westphal. Please note that this pull request has two merge conflicts between commit: 0c922a4850 ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish") from Linus' tree and commit: 2ab6096db2 ("xfrm: remove output_finish indirection from xfrm_state_afinfo") from the ipsec-next tree. and between commit: 3986912f6a ("ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl") from the net-next tree and commit: 0146dca70b ("xfrm: add support for UDPv6 encapsulation of ESP") from the ipsec-next tree. Both conflicts can be resolved as done in linux-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-29 13:02:33 -07:00
..
acpi	Additional ACPI updates for 5.7-rc1	2020-04-06 10:35:06 -07:00
asm-generic	arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>	2020-04-23 10:50:26 +09:00
clocksource
crypto	crypto: curve25519 - do not pollute dispatcher based on assembler	2020-04-09 00:01:59 +09:00
drm	drm: fix trivial field description cut-and-paste error	2020-05-11 10:48:53 -07:00
dt-bindings	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00
keys
kunit
kvm
linux	tcp: add tcp_sock_set_keepcnt	2020-05-28 11:11:45 -07:00
math-emu
media
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-05-29 13:02:33 -07:00
pcmcia
ras
rdma
scsi
soc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-06 22:10:13 -07:00
sound	ALSA: rawmidi: Fix racy buffer resize under concurrent accesses	2020-05-07 22:29:14 +02:00
target
trace	net_sched: add a tracepoint for qdisc creation	2020-05-27 15:05:49 -07:00
uapi	bridge: mrp: Rework the MRP netlink interface	2020-05-27 11:30:43 -07:00
vdso	vdso/datapage: Use correct clock mode name in comment	2020-04-20 19:19:52 +02:00
video
xen	xen: Use evtchn_type_t as a type for event channels	2020-04-07 12:12:54 +02:00