projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed8ada3 d93b3ac)
Merge tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Oct 2013 01:11:28 +0000 (18:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Oct 2013 01:11:28 +0000 (18:11 -0700)
Pull vfio fix from Alex Williamson:
 "Fix an incorrect break out of nested loop in iommu mapping code"

* tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio:
  VFIO: vfio_iommu_type1: fix bug caused by break in nested loop


Trivial merge
Linux 6.x block layer and io_uring tree(s)