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
..
6lowpan
9p	9p pull request for inclusion in 5.4	2019-09-27 15:10:34 -07:00
802	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
appletalk	appletalk: enforce CAP_NET_RAW for raw sockets	2019-09-24 16:37:18 +02:00
atm	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00
ax25	net: Make sock protocol value checks more specific	2020-01-09 18:41:40 -08:00
batman-adv	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
bluetooth	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00
bpf	bpf: Allow to change skb mark in test_run	2019-12-18 17:05:58 -08:00
bpfilter
bridge	net: bridge: vlan: notify on vlan add/delete/change flags	2020-01-15 13:48:18 +01:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-11-02 13:54:56 -07:00
can	can: j1939: j1939_sk_bind(): take priv after lock is held	2019-12-08 11:52:02 +01:00
ceph	libceph, rbd, ceph: convert to use the new mount API	2019-11-27 22:28:37 +01:00
core	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
dcb
dccp	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
decnet	net: Make sock protocol value checks more specific	2020-01-09 18:41:40 -08:00
dns_resolver
dsa	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
ethernet	net: add annotations on hh->hh_len lockless accesses	2019-11-07 20:07:30 -08:00
ethtool	ethtool: potential NULL dereference in strset_prepare_data()	2020-01-08 16:03:35 -08:00
hsr	net/hsr: remove seq_nr_after_or_eq	2020-01-21 12:03:21 +01:00
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-11-02 13:54:56 -07:00
ife	net: Fix Kconfig indentation	2019-09-26 08:56:17 +02:00
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
ipv6	ipv6: Add "offload" and "trap" indications to routes	2020-01-14 18:53:35 -08:00
iucv	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
kcm	kcm: disable preemption in kcm_parse_func_strparser()	2019-09-27 10:27:14 +02:00
key
l2tp	l2tp: Remove redundant BUG_ON() check in l2tp_pernet	2020-01-03 12:26:07 -08:00
l3mdev
lapb
llc	llc2: Fix return statement of llc_stat_ev_rx_null_dsap_xid_c (and _test_c)	2019-12-20 21:19:36 -08:00
mac80211	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
mac802154
mpls	net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup	2019-12-04 12:27:13 -08:00
ncsi	net/ncsi: Support for multi host mellanox card	2020-01-09 18:36:22 -08:00
netfilter	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
netlabel	netlabel: remove redundant assignment to pointer iter	2019-09-01 11:45:02 -07:00
netlink	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
netrom	net: core: add generic lockdep keys	2019-10-24 14:53:48 -07:00
nfc	net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive()	2019-12-18 11:57:33 -08:00
nsh
openvswitch	net: openvswitch: use skb_list_walk_safe helper for gso segments	2020-01-14 11:48:41 -08:00
packet	af_packet: refactoring code for prb_calc_retire_blk_tmo	2019-12-26 15:19:59 -08:00
phonet	net: Remove redundant BUG_ON() check in phonet_pernet	2020-01-03 12:25:50 -08:00
psample	net: psample: fix skb_over_panic	2019-11-26 14:40:13 -08:00
qrtr	net: qrtr: Remove receive worker	2020-01-14 18:36:42 -08:00
rds	net/rds: Use prefetch for On-Demand-Paging MR	2020-01-18 11:48:19 +02:00
rfkill	rfkill: Fix incorrect check to avoid NULL pointer dereference	2019-12-16 10:15:49 +01:00
rose	net/rose: remove redundant assignment to variable failed	2020-01-07 13:52:28 -08:00
rxrpc	RxRPC fixes	2019-12-24 16:12:47 -08:00
sched	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
smc	net/smc: allow unprivileged users to read pnet table	2020-01-21 11:39:56 +01:00
strparser
sunrpc	xprtrdma: Fix oops in Receive handler after device removal	2020-01-14 13:30:24 -05:00
switchdev
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
tls	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
unix	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
vmw_vsock	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
wimax	wimax: no need to check return value of debugfs_create functions	2019-08-10 15:25:47 -07:00
wireless	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2020-01-19 22:10:04 +01:00
x25	net/x25: fix nonblocking connect	2020-01-09 18:39:33 -08:00
xdp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-12-27 14:20:10 -08:00
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2020-01-21 12:18:20 +01:00
compat.c	y2038: socket: use __kernel_old_timespec instead of timespec	2019-11-15 14:38:29 +01:00
Kconfig	ethtool: introduce ethtool netlink interface	2019-12-27 16:40:01 -08:00
Makefile	ethtool: move to its own directory	2019-12-12 17:07:05 -08:00
socket.c	socket: fix unused-function warning	2020-01-08 15:02:21 -08:00
sysctl_net.c