Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source

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>

...

This commit is contained in:

Jakub Kicinski 2021-04-17 10:42:54 -07:00

parent 474f459360 88a5af9439

commit 8203c7ce4e

205 changed files with 1400 additions and 990 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/uapi/linux/idxd.h

View file