]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 648d9a7 64e4eef)
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)
commit8bb59173ffaf7f4a10eb30e7238b452b26b6628c
tree8c647466fa60cb281556016388adf0ad80172c8ctree | snapshot
parent648d9a7b0d1af39c93de5e7593fa366353298acacommit | diff
parent64e4eef3989145850c26208b1f0481f118a4a894commit | 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
Linux Kernel Source Tree.