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
  f3d21827be00 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  bb2d392b1cbb ("bnxt_en: 1PPS functions to configure TSIO pins")
  819e326576f7 ("bnxt_en: Event handler for PPS events")

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

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

MAINTAINERS
  37bc4b4e7e63 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  3a7a1cd5cd0a ("net: phy: add Maxlinear GPY115/21x/24x driver")

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