]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 7 Jun 2021 20:01:52 +0000 (13:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Jun 2021 20:01:52 +0000 (13:01 -0700)
commit126285651b7f95282a0afe3a1b0221419b31d989
treee5d547255814a5ed55b6b74be3155464598b39f2
parent9977d6f56bacc9784654be4d0f4d27b368f57f5b
parent3822d0670c9d4342794d73e0d0e615322b40438e
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

Bug fixes overlapping feature additions and refactoring, mostly.

Signed-off-by: David S. Miller <davem@davemloft.net>
27 files changed:
MAINTAINERS
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_hw_autogen.h
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/igb/igb_ptp.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/virtio_net.c
include/net/netfilter/nf_tables.h
net/bluetooth/hci_core.c
net/bluetooth/hci_sock.c
net/core/devlink.c
net/core/rtnetlink.c
net/core/sock.c
net/ipv6/route.c
net/ipv6/sit.c
net/mptcp/protocol.c
net/mptcp/subflow.c
net/netfilter/nfnetlink_cthelper.c
net/sched/sch_htb.c