David S. Miller 4f2c17e0f3 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-01-21 1) Add support for TCP encapsulation of IKE and ESP messages, as defined by RFC 8229. Patchset from Sabrina Dubroca. Please note that there is a merge conflict in: net/unix/af_unix.c between commit: 3c32da19a8 ("unix: Show number of pending scm files of receive queue in fdinfo") from the net-next tree and commit: b50b0580d2 ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram") from the ipsec-next tree. The conflict can be solved as done in linux-next. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-21 12:18:20 +01:00
..
acpi	Merge branches 'acpi-utils', 'acpi-platform', 'acpi-video' and 'acpi-doc'	2019-11-26 10:30:49 +01:00
asm-generic	asm-generic/nds32: don't redefine cacheflush primitives	2019-12-30 11:18:43 +01:00
clocksource	…
crypto	crypto: ablkcipher - remove deprecated and unused ablkcipher support	2019-11-17 09:02:49 +08:00
drm	drm/dp_mst: Have DP_Tx send one msg at a time	2020-01-15 17:01:21 -05:00
dt-bindings	dt-bindings: reset: meson8b: fix duplicate reset IDs	2019-12-09 15:21:20 -08:00
keys	powerpc updates for 5.5	2019-11-30 14:35:43 -08:00
kunit	…
kvm	…
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
math-emu	…
media	drm main pull for 5.5-rc1	2019-11-27 17:45:48 -08:00
misc	…
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
pcmcia	…
ras	…
rdma	IB/core: Add interface to advise_mr for kernel users	2020-01-16 16:14:42 +02:00
scsi	scsi: target: iscsi: Wait for all commands to finish before freeing a session	2019-11-19 21:37:35 -05:00
soc	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
sound	ASoC: Fixes for v5.5	2019-12-17 14:18:32 +01:00
target	…
trace	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
uapi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
vdso	…
video	…
xen	xen/interface: re-define FRONT/BACK_RING_ATTACH()	2019-12-20 13:44:42 +01:00