Skip to content
Commit 79548b79 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  3fbe4d8c ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
  92453132 ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents da617cd8 b2bc47e9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment