git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

projects / mirror_ubuntu-kernels.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 30 Mar 2023 21:43:03 +0000 (14:43 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 30 Mar 2023 21:43:03 +0000 (14:43 -0700)
commit	79548b7984e4c606c6caaad72a0864a83855ebc9
tree	05e1be823acbae8bbcd155a706eb9e4f84eee047	tree
parent	da617cd8d90608582eb8d0b58026f31f1a9bfb1d	commit \| diff
parent	b2bc47e9b2011a183f9d3d3454a294a938082fb9	commit \| diff

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

Conflicts:

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

23 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_mmap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_ppe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_ppe_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/txgbe/txgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ieee802154/ca8210.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/sfp-bus.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
io_uring/rsrc.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/vsock_loopback.c	diff1 \|	diff2 \|	blob \| history

Ubuntu combined Linux kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_mmap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_ppe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_ppe_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/txgbe/txgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ieee802154/ca8210.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/sfp-bus.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
io_uring/rsrc.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/vsock_loopback.c	diff1 \|	diff2 \|	blob \| history