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
..
accel.h	net/mlx5: Accel, Add core IPsec support for the Connect-X family	2020-07-16 16:36:42 -07:00
cq.h	net/mlx5: Avoid RDMA file inclusion in core driver	2020-06-27 13:50:46 -07:00
device.h	net/mlx5: Allocate individual capability	2021-08-11 11:14:33 -07:00
doorbell.h
driver.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
eq.h	net/mlx5: Provide cpumask at EQ creation phase	2021-06-14 20:57:57 -07:00
eswitch.h	net/mlx5: E-Switch, Add event callback for representors	2021-08-05 13:49:24 -07:00
fs.h	net/mlx5: Move TTC logic to fs_ttc	2021-08-02 19:26:26 -07:00
fs_helpers.h
mlx5_ifc.h	Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux	2021-08-10 13:19:17 -07:00
mlx5_ifc_fpga.h	net/mlx5: fix spelling mistake "reserverd" -> "reserved"	2020-02-18 15:44:07 +02:00
mlx5_ifc_vdpa.h	vdpa/mlx5: Make hardware definitions visible to all mlx5 devices	2020-12-04 14:46:56 +02:00
mpfs.h	{net,vdpa}/mlx5: Configure interface MAC into mpfs L2 table	2021-05-18 23:01:48 -07:00
port.h	net/mlx5: Add support for DSFP module EEPROM dumps	2021-04-11 16:34:56 -07:00
qp.h	RDMA/mlx5: Refactor get_ts_format functions to simplify code	2021-06-22 09:35:16 +03:00
rsc_dump.h	net/mlx5: Add support in query QP, CQ and MKEY segments	2020-06-23 17:26:10 +03:00
transobj.h	net/mlx5e: Fix page reclaim for dead peer hairpin	2021-06-09 17:20:03 -07:00
vport.h	net/mlx5: E-Switch, Prepare to return total vports from eswitch struct	2021-04-24 00:58:43 -07:00