git.maquefel.me Git - linux.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 7 Mar 2024 18:19:05 +0000 (10:19 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 7 Mar 2024 18:29:36 +0000 (10:29 -0800)
commit	e3afe5dd3abea43e056a004df02fb49f24cc5ad7
tree	a8f38510fe1aeee32a54112fdee27e1948cde35e	tree \| snapshot
parent	a148f82c457f957cdc9445101882c225aa8c3ff0	commit \| diff
parent	df4793505abd5df399bc6d9a4d8fe81761f557cd	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

net/core/page_pool_user.c
0b11b1c5c320 ("netdev: let netlink core handle -EMSGSIZE errors")
429679dcf7d9 ("page_pool: fix netlink dump stop/resume")

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

32 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_core.c	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_netlink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz8795.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/pds_core/auxbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_dpll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_sriov.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_xsk.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/dpll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/health.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
include/linux/dpll.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/page_pool_user.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/diag.sh	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_core.c	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_netlink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz8795.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/pds_core/auxbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_dpll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_sriov.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_xsk.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/dpll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/health.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
include/linux/dpll.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/page_pool_user.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/diag.sh	diff1 \|	diff2 \|	blob \| history