tree 07b4079057e035a4063788f120665f5e42967e8e
parent 474f459360399c5becfd0f189a8894e9e17ad3d3
parent 88a5af943985fb43b4c9472b5abd9c0b9705533d
author Jakub Kicinski <kuba@kernel.org> 1618681374 -0700
committer Jakub Kicinski <kuba@kernel.org> 1618682887 -0700

Merge git://git.kernel.org/pub/scm/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>