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

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

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  760240b99902 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  aea3abb0161d ("bnxt_en: 1PPS functions to configure TSIO pins")
  5eddd36b0f62 ("bnxt_en: Event handler for PPS events")

kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
  6d01a3449da5 ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
  1d7c9b739fe1 ("bpf: Add ambient BPF runtime context stored in current")

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
  72274d2690ae ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
  c3c7ace78708 ("net/mlx5: Refcount mlx5_irq with integer")

MAINTAINERS
  b19faf28ade5 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  90567a488aaf ("net: phy: add Maxlinear GPY115/21x/24x driver")

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