android_kernel_samsung_sm8650/drivers/infiniband/hw
Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
  7b50ecfcc6 ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0db ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f6 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-28 10:43:58 -07:00
..
bnxt_re RDMA v5.15 merge window 2nd Pull Request 2021-09-09 11:14:14 -07:00
cxgb4 Merge branch 'sg_nents' into rdma.git for-next 2021-08-30 09:49:59 -03:00
efa RDMA v5.15 merge window Pull Request 2021-09-02 14:47:21 -07:00
hfi1 IB/hfi1: Fix abba locking issue with sc_disable() 2021-10-13 13:33:22 -03:00
hns RDMA/hns: Add the check of the CQE size of the user space 2021-09-27 14:49:49 -03:00
irdma RDMA/irdma: Do not hold qos mutex twice on QP resume 2021-10-19 20:22:01 -03:00
mlx4 mlx4: replace mlx4_mac_to_u64() with ether_addr_to_u64() 2021-10-05 13:15:35 +01:00
mlx5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-10-28 10:43:58 -07:00
mthca RDMA: switch from 'pci_' to 'dma_' API 2021-08-23 13:43:54 -03:00
ocrdma RDMA: Globally allocate and release QP memory 2021-08-03 13:44:27 -03:00
qedr Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-10-28 10:43:58 -07:00
qib IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields 2021-10-13 13:26:04 -03:00
usnic RDMA/usnic: Lock VF with mutex instead of spinlock 2021-09-24 10:55:28 -03:00
vmw_pvrdma RDMA: switch from 'pci_' to 'dma_' API 2021-08-23 13:43:54 -03:00
Makefile RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw 2021-06-02 20:06:36 -03:00