mirror_ubuntu-kernels/drivers/net/ethernet/marvell/mvpp2
Jakub Kicinski 79548b7984 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-03-30 14:43:03 -07:00
..
Makefile net: mvpp2: ptp: add TAI support 2020-09-09 14:22:42 -07:00
mvpp2_cls.c net: mvpp2: classifier flow fix fragmentation flags 2023-03-28 11:34:01 +02:00
mvpp2_cls.h net: marvell: Fixed two spellings,controling to controlling and oen to one 2021-01-12 19:02:01 -08:00
mvpp2_debugfs.c net: mvpp2: fix mvpp2 debugfs leak 2022-10-03 16:53:46 -07:00
mvpp2_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-03-17 16:29:25 -07:00
mvpp2_prs.c net: mvpp2: parser fix PPPoE 2023-03-28 11:34:01 +02:00
mvpp2_prs.h net: mvpp2: Add parsing support for different IPv4 IHL values 2021-04-16 15:29:40 -07:00
mvpp2_tai.c net: mvpp2: ptp: add support for receive timestamping 2020-09-09 14:22:42 -07:00
mvpp2.h net: mvpp2: fix mvpp2 debugfs leak 2022-10-03 16:53:46 -07:00