Skip to content
Commit c78d218f authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v5.15-rc4' into rdma.get for-next



Merged due to dependencies in following patches.

Conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c resolved by hand to take
the %p change and txq stats rename together.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 0994a1bc 9e1ff307
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment