diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:35:02 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:35:02 +0900 |
commit | 2f3f056685198e9fc76c23bd88fbe2662ab7b044 (patch) | |
tree | 98ee7ade3620cac729ce85434fd85e84e411ea64 /fs/ocfs2/heartbeat.c | |
parent | 4c5e8fc62d6a63065eeae80808c498d1dcfea4f4 (diff) | |
parent | 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b (diff) | |
download | blackbird-obmc-linux-2f3f056685198e9fc76c23bd88fbe2662ab7b044.tar.gz blackbird-obmc-linux-2f3f056685198e9fc76c23bd88fbe2662ab7b044.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"virtio, vhost: features, fixes
- PCI virtual function support for virtio
- DMA barriers for virtio strong barriers
- bugfixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: update the comments for transport features
virtio_pci: support enabling VFs
vhost: fix info leak due to uninitialized memory
virtio_ring: switch to dma_XX barriers for rpmsg
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
0 files changed, 0 insertions, 0 deletions