]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Sep 2018 05:22:42 +0000 (22:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Sep 2018 05:22:42 +0000 (22:22 -0700)
1  2 
MAINTAINERS
drivers/net/ethernet/lantiq_etop.c
include/linux/mlx5/driver.h
net/ipv4/ip_fragment.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/netfilter/nfnetlink_queue.c
net/sched/act_tunnel_key.c
net/tls/tls_sw.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge