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
..
asm-generic	arch: sembuf.h: make uapi asm/sembuf.h self-contained	2019-12-04 19:44:14 -08:00
drm	drm/vmwgfx: Add surface dirty-tracking callbacks	2019-11-06 15:45:32 +01:00
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
misc	habanalabs: expose reset counters via existing INFO IOCTL	2019-11-21 11:35:47 +02:00
mtd	mtd: abi: do not use C++ style comments in uapi header	2019-07-07 20:31:29 +02:00
rdma	RDMA/efa: Expose RDMA read related attributes	2019-11-25 10:31:48 -04:00
scsi	scsi: use __u{8,16,32,64} instead of uint{8,16,32,64}_t in uapi headers	2019-08-12 22:19:27 -04:00
sound	ALSA: compress: add flac decoder params	2019-11-18 13:02:25 +00:00
video
xen
Kbuild	kbuild: re-implement Makefile.headersinst without recursion	2019-06-15 19:57:02 +09:00