| commit | 8203c7ce4ef2840929d38b447b4ccd384727f92b | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Sat Apr 17 10:42:54 2021 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Sat Apr 17 11:08:07 2021 -0700 |
| tree | 07b4079057e035a4063788f120665f5e42967e8e | |
| parent | 474f459360399c5becfd0f189a8894e9e17ad3d3 [diff] | |
| parent | 88a5af943985fb43b4c9472b5abd9c0b9705533d [diff] |
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>