]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 7 Mar 2024 18:19:05 +0000 (10:19 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Mar 2024 18:29:36 +0000 (10:29 -0800)
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:
1  2 
MAINTAINERS
drivers/dpll/dpll_core.c
drivers/dpll/dpll_netlink.c
drivers/net/bonding/bond_main.c
drivers/net/dsa/microchip/ksz8795.c
drivers/net/ethernet/amd/pds_core/auxbus.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ice/ice_dpll.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_sriov.c
drivers/net/ethernet/intel/ice/ice_virtchnl.c
drivers/net/ethernet/intel/ice/ice_xsk.c
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx5/core/dpll.c
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
drivers/net/ethernet/mellanox/mlx5/core/health.c
drivers/net/geneve.c
drivers/net/usb/lan78xx.c
include/linux/dpll.h
include/linux/mlx5/mlx5_ifc.h
include/linux/netdevice.h
kernel/bpf/verifier.c
net/core/dev.c
net/core/page_pool_user.c
net/core/rtnetlink.c
net/ipv6/route.c
net/netfilter/nf_tables_api.c
net/xfrm/xfrm_user.c
tools/testing/selftests/net/mptcp/diag.sh

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge