Jakub Kicinski
f4083a752a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins")
099fdeda65 ("bnxt_en: Event handler for PPS events")
kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current")
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer")
MAINTAINERS
7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>