mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 21:12:43 +00:00
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/[email protected] https://lore.kernel.org/r/[email protected] - irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info change from for-next https://lore.kernel.org/r/[email protected] Signed-off-by: Jason Gunthorpe <[email protected]>