| commit | c78d218fc5a9995d6b50aa38814bef4fbc88a77d | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@nvidia.com> | Mon Oct 04 15:59:49 2021 -0300 |
| committer | Jason Gunthorpe <jgg@nvidia.com> | Mon Oct 04 16:01:26 2021 -0300 |
| tree | 8c647466fa60cb281556016388adf0ad80172c8c | |
| parent | 0994a1bcd5f7c0bf7ca3b4938d4f0f6928ac7886 [diff] | |
| parent | 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 [diff] |
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: Jason Gunthorpe <jgg@nvidia.com>