linux/drivers/infiniband/hw
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
..
bnxt_re RDMA/bnxt_re: Fix stats counters 2021-07-12 14:42:27 -03:00
cxgb4 RDMA/iw_cxgb4: Fix refcount underflow while destroying cqs. 2021-08-05 22:33:00 -03:00
efa RDMA: Split the alloc_hw_stats() ops to port and device variants 2021-06-16 20:58:29 -03:00
hfi1 Tracing updates for 5.14: 2021-07-03 11:13:22 -07:00
hns RDMA/hns: Fix the double unlock problem of poll_sem 2021-08-03 13:42:44 -03:00
irdma RDMA/irdma: Change returned type of irdma_setup_virt_qp to void 2021-07-15 15:14:11 -03:00
mlx4 Linux 5.13-rc7 2021-06-22 14:43:51 -03:00
mlx5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
mthca RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
ocrdma RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
qedr RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
qib RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
usnic RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
vmw_pvrdma RDMA: Remove rdma_set_device_sysfs_group() 2021-06-16 20:58:32 -03:00
Makefile RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw 2021-06-02 20:06:36 -03:00