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
..
8139cp.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
8139too.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	r8169: factor out PHY configuration to r8169_phy_config.c	2020-01-10 16:41:35 -08:00
atp.c	net: realtek: remove leading spaces before tabs	2021-05-19 12:17:31 -07:00
atp.h	…
r8169.h	r8169: Add support for another RTL8168FP	2021-02-02 18:02:55 -08:00
r8169_firmware.c	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
r8169_firmware.h	r8169: factor out firmware handling	2019-06-05 11:41:59 -07:00
r8169_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
r8169_phy_config.c	r8169: Add support for another RTL8168FP	2021-02-02 18:02:55 -08:00