projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 474f459 88a5af9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 17 Apr 2021 17:42:54 +0000 (10:42 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 17 Apr 2021 18:08:07 +0000 (11:08 -0700)
commit8203c7ce4ef2840929d38b447b4ccd384727f92b
tree07b4079057e035a4063788f120665f5e42967e8etree | snapshot
parent474f459360399c5becfd0f189a8894e9e17ad3d3commit | diff
parent88a5af943985fb43b4c9472b5abd9c0b9705533dcommit | diff
Merge git://git./linux/kernel/git/netdev/net

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 - keep the ZC code, drop the code related to reinit
net/bridge/netfilter/ebtables.c
 - fix build after move to net_generic

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
29 files changed:
Documentation/networking/ip-sysctl.rst diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/davicom/dm9000.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_dcb.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/devlink.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.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/geneve.c diff1 | diff2 | blob | history
include/linux/marvell_phy.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/bridge/netfilter/ebtables.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ethtool/netlink.h diff1 | diff2 | blob | history
net/ethtool/pause.c diff1 | diff2 | blob | history
net/ipv4/sysctl_net_ipv4.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/ipv6/sit.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_standalone.c diff1 | diff2 | blob | history
net/netfilter/nf_flow_table_offload.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/x_tables.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
tools/lib/bpf/xsk.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository