Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  9e266807 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f25 ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda ("bnxt_en: Event handler for PPS events")

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

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

MAINTAINERS
  7b637cd5 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  7d901a1e ("net: phy: add Maxlinear GPY115/21x/24x driver")

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