bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-05 23:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
4f2c17e0f3324b3b82a3e0985245aefd6dcc5495
linux/net/ipv4
History
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
..
bpfilter
Merge tag 'spdx-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2019-05-21 12:33:38 -07:00
netfilter
netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct
2020-01-13 19:22:10 +01:00
af_inet.c
net: port < inet_prot_sock(net) --> inet_port_requires_bind_service(net, port)
2019-11-26 13:20:46 -08:00
ah4.c
xfrm: remove type and offload_type map from xfrm_state_afinfo
2019-06-06 08:34:50 +02:00
arp.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
cipso_ipv4.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13
2019-05-21 11:28:45 +02:00
datagram.c
inet: stop leaking jiffies on the wire
2019-11-01 14:57:52 -07:00
devinet.c
inet: protect against too small mtu values.
2019-12-07 11:55:11 -08:00
esp4_offload.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2019-07-05 15:01:15 -07:00
esp4.c
xfrm: add espintcp (RFC 8229)
2019-12-09 09:59:07 +01:00
fib_frontend.c
ipv4: move fib4_has_custom_rules() helper to public header
2019-11-21 14:45:55 -08:00
fib_lookup.h
ipv4: Add "offload" and "trap" indications to routes
2020-01-14 18:53:35 -08:00
fib_notifier.c
net: fib_notifier: propagate extack down to the notifier block callback
2019-10-04 11:10:56 -07:00
fib_rules.c
net: fib_notifier: propagate extack down to the notifier block callback
2019-10-04 11:10:56 -07:00
fib_semantics.c
ipv4: Add "offload" and "trap" indications to routes
2020-01-14 18:53:35 -08:00
fib_trie.c
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
2020-01-19 22:10:04 +01:00
fou.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
gre_demux.c
gre: refetch erspan header from skb->data after pskb_may_pull()
2019-12-07 11:53:27 -08:00
gre_offload.c
net: remove the check argument from __skb_gro_checksum_convert
2020-01-03 12:24:34 -08:00
icmp.c
net: icmp: fix data-race in cmp_global_allow()
2019-11-08 12:32:43 -08:00
igmp.c
igmp: uninline ip_mc_validate_checksum()
2019-10-04 14:26:46 -07:00
inet_connection_sock.c
tcp/ipv4: remove AF_INET_FAMILY
2020-01-21 12:03:51 +01:00
inet_diag.c
tcp/dccp: fix possible race __inet_lookup_established()
2019-12-13 21:40:49 -08:00
inet_fragment.c
inet: frags: re-introduce skb coalescing for local delivery
2019-08-08 15:55:10 -07:00
inet_hashtables.c
tcp/dccp: fix possible race __inet_lookup_established()
2019-12-13 21:40:49 -08:00
inet_timewait_sock.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
inetpeer.c
inetpeer: fix data-race in inet_putpeer / inet_putpeer
2019-11-07 16:15:56 -08:00
ip_forward.c
ipv4: Revert removal of rt_uses_gateway
2019-09-20 18:23:33 -07:00
ip_fragment.c
inet: frags: re-introduce skb coalescing for local delivery
2019-08-08 15:55:10 -07:00
ip_gre.c
treewide: Use sizeof_field() macro
2019-12-09 10:36:44 -08:00
ip_input.c
ipv4: use dst hint for ipv4 list receive
2019-11-21 14:45:55 -08:00
ip_options.c
netfilter: nf_tables: add support for matching IPv4 options
2019-06-21 18:35:51 +02:00
ip_output.c
net: ipv4: use skb_list_walk_safe helper for gso segments
2020-01-14 11:48:41 -08:00
ip_sockglue.c
ip_sockglue: Fix missing-check bug in ip_ra_control()
2019-05-25 11:00:50 -07:00
ip_tunnel_core.c
lwtunnel: check erspan options before allocating tun_info
2019-11-21 11:47:39 -08:00
ip_tunnel.c
tunnel: do not confirm neighbor when do pmtu update
2019-12-24 22:28:55 -08:00
ip_vti.c
vti: do not confirm neighbor when do pmtu update
2019-12-24 22:28:55 -08:00
ipcomp.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2019-07-05 15:01:15 -07:00
ipconfig.c
net: ipconfig: Wait for deferred device probes
2019-11-20 12:39:53 -08:00
ipip.c
ipip: validate header length in ipip_tunnel_xmit
2019-07-25 17:23:40 -07:00
ipmr_base.c
net: fib_notifier: propagate extack down to the notifier block callback
2019-10-04 11:10:56 -07:00
ipmr.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-16 21:51:42 -08:00
Kconfig
xfrm: add espintcp (RFC 8229)
2019-12-09 09:59:07 +01:00
Makefile
net: Initial nexthop code
2019-05-28 21:37:30 -07:00
metrics.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
netfilter.c
netfilter: ipv4: remove useless export_symbol
2019-01-28 11:32:58 +01:00
netlink.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
nexthop.c
net: remove the unnecessary strict_start_type in some policies
2019-11-21 11:46:18 -08:00
ping.c
ip: support SO_MARK cmsg
2019-09-13 21:44:19 +02:00
proc.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-17 20:20:36 -07:00
protocol.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
raw_diag.c
net: don't warn in inet diag when IPV6 is disabled
2019-07-03 11:26:35 -07:00
raw.c
netfilter: drop bridge nf reset from nf_reset
2019-10-01 18:42:15 +02:00
route.c
ipv4: Add "offload" and "trap" indications to routes
2020-01-14 18:53:35 -08:00
syncookies.c
tcp: Remove one extra ktime_get_ns() from cookie_init_timestamp
2019-11-07 16:17:52 -08:00
sysctl_net_ipv4.c
net-tcp: Disable TCP ssthresh metrics cache by default
2019-12-09 20:17:48 -08:00
tcp_bbr.c
net: annotate lockless accesses to sk->sk_pacing_shift
2019-12-17 22:09:52 -08:00
tcp_bic.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_bpf.c
bpf: Sockmap/tls, fix pop data with SK_DROP return code
2020-01-15 23:26:13 +01:00
tcp_cdg.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_cong.c
tcp: warn if offset reach the maxlen limit when using snprintf
2019-11-20 22:23:36 -08:00
tcp_cubic.c
tcp_cubic: refactor code to perform a divide only when needed
2019-12-30 14:44:27 -08:00
tcp_dctcp.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
tcp_dctcp.h
tcp: refactor DCTCP ECN ACK handling
2018-10-10 22:26:00 -07:00
tcp_diag.c
net: annotate lockless accesses to sk->sk_max_ack_backlog
2019-11-06 16:14:48 -08:00
tcp_fastopen.c
tcp: add TCP_INFO status for failed client TFO
2019-10-25 19:25:37 -07:00
tcp_highspeed.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_htcp.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_hybla.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_illinois.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_input.c
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
2020-01-19 22:10:04 +01:00
tcp_ipv4.c
tcp: Export TCP functions and ops struct
2020-01-09 18:41:41 -08:00
tcp_lp.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_metrics.c
net-tcp: Disable TCP ssthresh metrics cache by default
2019-12-09 20:17:48 -08:00
tcp_minisocks.c
tcp: annotate tp->snd_nxt lockless reads
2019-10-13 10:13:08 -07:00
tcp_nv.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_offload.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
tcp_output.c
tcp: Check for filled TCP option space before SACK
2020-01-09 18:41:41 -08:00
tcp_rate.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
tcp_recovery.c
tcp: introduce tcp_skb_timestamp_us() helper
2018-09-21 19:37:59 -07:00
tcp_scalable.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_timer.c
tcp: refactor tcp_retransmit_timer()
2019-12-03 11:52:38 -08:00
tcp_ulp.c
bpf: Sockmap/tls, push write_space updates through ulp updates
2020-01-15 23:26:13 +01:00
tcp_vegas.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_vegas.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
tcp_veno.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_westwood.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp_yeah.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
tcp.c
tcp: Export TCP functions and ops struct
2020-01-09 18:41:41 -08:00
tunnel4.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
udp_diag.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
udp_impl.h
udp: add missing rehash callback to udplite
2019-01-17 15:01:08 -08:00
udp_offload.c
net: remove the check argument from __skb_gro_checksum_convert
2020-01-03 12:24:34 -08:00
udp_tunnel.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
udp.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2020-01-21 12:18:20 +01:00
udplite.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
xfrm4_input.c
xfrm: reset transport header back to network header after all input transforms ahave been applied
2018-09-04 10:26:30 +02:00
xfrm4_output.c
netfilter: Support iif matches in POSTROUTING
2019-11-15 23:44:48 +01:00
xfrm4_policy.c
net: add bool confirm_neigh parameter for dst_ops.update_pmtu
2019-12-24 22:28:54 -08:00
xfrm4_protocol.c
xfrm: add route lookup to xfrm4_rcv_encap
2019-12-09 09:59:07 +01:00
xfrm4_state.c
xfrm: remove eth_proto value from xfrm_state_afinfo
2019-06-06 08:34:50 +02:00
xfrm4_tunnel.c
xfrm: remove type and offload_type map from xfrm_state_afinfo
2019-06-06 08:34:50 +02:00