projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0994a1b 9e1ff30)
Merge tag 'v5.15-rc4' into rdma.get for-next
authorJason Gunthorpe <jgg@nvidia.com>
Mon, 4 Oct 2021 18:59:49 +0000 (15:59 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 4 Oct 2021 19:01:26 +0000 (16:01 -0300)
commitc78d218fc5a9995d6b50aa38814bef4fbc88a77d
tree8c647466fa60cb281556016388adf0ad80172c8ctree | snapshot
parent0994a1bcd5f7c0bf7ca3b4938d4f0f6928ac7886commit | diff
parent9e1ff307c779ce1f0f810c7ecce3d95bbae40896commit | 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>
drivers/infiniband/hw/hfi1/ipoib_tx.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git