Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 24 May 2020 20:47:27 +0000 (13:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 May 2020 20:47:27 +0000 (13:47 -0700)
commit13209a8f7304a34158f4366e8ea07a1965c05ac7
treef25ba4846fe02a32d4a14ef1a6be3227363da919
parent316107119f473e764cf5e50437333c8b83bec0da
parent98790bbac4db1697212ce9462ec35ca09c4a2810
Merge git://git./linux/kernel/git/netdev/net

The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
50 files changed:
MAINTAINERS
drivers/net/dsa/b53/b53_srab.c
drivers/net/dsa/mt7530.c
drivers/net/dsa/mt7530.h
drivers/net/dsa/ocelot/felix.c
drivers/net/dsa/ocelot/felix.h
drivers/net/dsa/ocelot/felix_vsc9959.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
drivers/net/ethernet/mellanox/mlx5/core/eq.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/ethernet/realtek/r8169_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/sun/cassini.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/cpsw_priv.c
drivers/net/ethernet/ti/netcp_ethss.c
drivers/net/ipa/gsi.c
drivers/net/phy/mscc/mscc.h
drivers/net/phy/mscc/mscc_main.c
drivers/net/phy/phy_device.c
drivers/net/usb/r8152.c
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
include/linux/mlx5/driver.h
include/net/act_api.h
kernel/bpf/syscall.c
kernel/sched/fair.c
net/core/dev.c
net/ethtool/netlink.c
net/ipv4/inet_connection_sock.c
net/ipv4/ipip.c
net/ipv4/ipmr.c
net/ipv4/nexthop.c
net/ipv4/route.c
net/ipv6/ip6_fib.c
net/mptcp/options.c
net/mptcp/protocol.h
net/mptcp/subflow.c
net/rxrpc/sysctl.c