]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 80e19f3 cc03155)
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Jul 2022 00:16:22 +0000 (17:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Jul 2022 00:16:22 +0000 (17:16 -0700)
commitca85855bdcae8f84f1512e88b4c75009ea17ea2f
tree9b6af08842dd083f9ee7c9ec2fb21493c0042c71tree
parent80e19f34c2887a8881084b7bb7480e9544d56b91commit | diff
parentcc0315564d6eec91c716d314b743321be24c70b3commit | diff
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma fixes from Jason Gunthorpe:
 "Two bug fixes for irdma:

   - x722 does not support 1GB pages, trying to configure them will
     corrupt the dma mapping

   - Fix a sleep while holding a spinlock"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/irdma: Fix sleep from invalid context BUG
  RDMA/irdma: Do not advertise 1GB page size for x722
Unnamed repository; edit this file 'description' to name the repository.