2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
linux/drivers/infiniband/hw/usnic
Jason Gunthorpe ef2233850e Linux 6.15
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCgA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmgzoyMeHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG0cEIAJrO2lKaFN4fbv6G
 FQTHQF1soicGpak3yY9u1o5LCqEIzjW2ScxcKG+dl7FcXsaZYcyg4HNzxbV9l/rr
 Ck2qZh3CCkVem0/nEsOJwYbNYKnq+pM5h1jIwn/LUkRuV55s5K5oRHzRj673BEj5
 BLaRFivZ1t4eM64EqbU1ut11/VEAkr2GcB01forHDeuWwoa3p6DfmALo7X/U43Vg
 FN2hp/3PPfiU6PwoCxQlmMpHNFkoZOHpi8P8Qm+mu0MQI12QrUC1Riib4EkrwEEv
 a28F4Au+TIjLceRdi6Ss/rhTC71usQIQ2OnnmHBUeYgdwHRXHgfewhtQDUKTU0MR
 OwKECbY=
 =skuS
 -----END PGP SIGNATURE-----

Merge tag 'v6.15' into rdma.git for-next

Following patches need the RDMA rc branch since we are past the RC cycle
now.

Merge conflicts resolved based on Linux-next:

- For RXE odp changes keep for-next version and fixup new places that
  need to call is_odp_mr()
  https://lore.kernel.org/r/20250422143019.500201bd@canb.auug.org.au
  https://lore.kernel.org/r/20250514122455.3593b083@canb.auug.org.au

- irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info
  change from for-next
  https://lore.kernel.org/r/20250513130630.280ee6c5@canb.auug.org.au

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2025-05-26 15:33:52 -03:00
..
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile infiniband: prefix header search paths with $(srctree)/ 2019-01-25 15:28:50 -07:00
usnic_abi.h kernel-wide: add explicity||explicitly to spelling.txt 2025-01-12 20:21:06 -08:00
usnic_common_pkt_hdr.h
usnic_common_util.h
usnic_debugfs.c RDMA/usnic: Delete useless module.h include 2022-01-28 13:03:13 -04:00
usnic_debugfs.h
usnic_fwd.c RDMA: Constify netdev->dev_addr accesses 2021-10-25 14:33:09 -03:00
usnic_fwd.h RDMA: Constify netdev->dev_addr accesses 2021-10-25 14:33:09 -03:00
usnic_ib_main.c RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe() 2025-04-07 15:08:32 -03:00
usnic_ib_qp_grp.c RDMA/usnic: Delete useless module.h include 2022-01-28 13:03:13 -04:00
usnic_ib_qp_grp.h RDMA: Globally allocate and release QP memory 2021-08-03 13:44:27 -03:00
usnic_ib_sysfs.c RDMA/usnic: Delete useless module.h include 2022-01-28 13:03:13 -04:00
usnic_ib_sysfs.h RDMA/drivers: Use core provided API for registering device attributes 2018-10-17 03:45:01 -06:00
usnic_ib_verbs.c RDMA: Pass entire uverbs attr bundle to create cq function 2024-06-27 16:28:21 -03:00
usnic_ib_verbs.h RDMA: Pass entire uverbs attr bundle to create cq function 2024-06-27 16:28:21 -03:00
usnic_ib.h RDMA/usnic: Lock VF with mutex instead of spinlock 2021-09-24 10:55:28 -03:00
usnic_log.h
usnic_transport.c RDMA/usnic: Delete useless module.h include 2022-01-28 13:03:13 -04:00
usnic_transport.h
usnic_uiom_interval_tree.c treewide: Change list_sort to use const pointers 2021-04-08 16:04:22 -07:00
usnic_uiom_interval_tree.h
usnic_uiom.c RDMA: Don't use %pK through printk 2025-04-09 14:30:10 -04:00
usnic_uiom.h RDMA/usnic: Annotate struct usnic_uiom_chunk with __counted_by 2023-10-02 14:44:54 +03:00
usnic_vnic.c RDMA/usnic: Delete useless module.h include 2022-01-28 13:03:13 -04:00
usnic_vnic.h
usnic.h