]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 13 Nov 2020 00:54:48 +0000 (16:54 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 13 Nov 2020 00:54:48 +0000 (16:54 -0800)
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 files changed:
1  2 
MAINTAINERS
drivers/net/dsa/mv88e6xxx/devlink.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/microchip/lan743x_main.c
drivers/net/ethernet/realtek/r8169_main.c
drivers/net/phy/realtek.c
net/ipv4/ip_tunnel_core.c
net/ipv4/udp_offload.c
net/ipv6/sit.c
net/ipv6/udp_offload.c
net/mptcp/protocol.c
net/tipc/topsrv.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/sit.c
Simple merge
Simple merge
Simple merge
Simple merge