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>		2021-08-13 06:41:22 -07:00
..
sparx5	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
Kconfig	net: sparx5: add the basic sparx5 driver	2021-06-24 11:28:12 -07:00
Makefile	net: sparx5: add the basic sparx5 driver	2021-06-24 11:28:12 -07:00
enc28j60.c	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00
enc28j60_hw.h	…
encx24j600-regmap.c	drivers/net/ethernet: clean up mis-targeted comments	2020-09-25 16:29:00 -07:00
encx24j600.c	net: encx24j600: fix kernel-doc syntax in file headers	2021-05-20 15:25:38 -07:00
encx24j600_hw.h	net: encx24j600: fix kernel-doc syntax in file headers	2021-05-20 15:25:38 -07:00
lan743x_ethtool.c	lan743x: remove redundant intializations of pointers adapter and phydev	2021-03-29 10:56:41 -07:00
lan743x_ethtool.h	…
lan743x_main.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
lan743x_main.h	lan743x: boost performance on cpu archs w/o dma cache snooping	2021-02-16 15:08:48 -08:00
lan743x_ptp.c	lan743x: Added fixed link and RGMII support	2020-06-01 11:51:17 -07:00
lan743x_ptp.h	Support LAN743x PTP periodic output on any GPIO	2019-11-11 12:46:56 -08:00