git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 24 May 2020 20:47:27 +0000 (13:47 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sun, 24 May 2020 20:47:27 +0000 (13:47 -0700)
commit	d3efa0cc0d6639b8667b4f750f89ef66c4a35603
tree	f25ba4846fe02a32d4a14ef1a6be3227363da919	tree \| snapshot
parent	d740f9ad76c26785c494544491849cc98be48e69	commit \| diff
parent	2d12d0dfcbf951bc1cda180a944e18419c8fe944	commit \| diff

Merge git://git.kernel.org/pub/scm/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	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_srab.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix_vsc9959.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/cassini.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/am65-cpsw-nuss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw_priv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/netcp_ethss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ipa/gsi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mscc/mscc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mscc/mscc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/net/act_api.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/netlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipip.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/nexthop.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.h	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/sysctl.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

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