Jakub Kicinski
f4083a752a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
9e26680733d5 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
9e518f25802c ("bnxt_en: 1PPS functions to configure TSIO pins")
099fdeda659d ("bnxt_en: Event handler for PPS events")
kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
a2baf4e8bb0f ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
c7603cfa04e7 ("bpf: Add ambient BPF runtime context stored in current")
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
5957cc557dc5 ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
2d0b41a37679 ("net/mlx5: Refcount mlx5_irq with integer")
MAINTAINERS
7b637cd52f02 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-08-13 06:41:22 -07:00
2021-05-17 13:30:29 +02:00
2020-11-06 08:08:37 -08:00
2021-06-21 08:34:21 -04:00
2021-05-12 22:36:37 +03:00
2021-04-22 12:22:11 -07:00
2020-10-05 13:37:03 +02:00
2020-06-02 17:36:24 -07:00
2021-06-10 09:52:32 -07:00
2021-08-05 15:08:47 -07:00
2021-06-08 10:23:08 -07:00
2021-06-16 00:01:28 +09:00
2020-10-17 15:05:30 -06:00
2021-04-27 19:32:55 -07:00
2020-08-20 11:25:03 -07:00
2019-07-19 10:42:02 -07:00
2021-04-22 12:22:10 -07:00
2021-04-16 16:10:36 -07:00
2021-06-11 13:21:28 -04:00
2021-04-22 12:22:10 -07:00
2020-04-27 02:07:40 -04:00
2021-08-10 10:10:10 +02:00
f4083a752a