diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 18:58:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 18:58:27 -0700 |
| commit | e241e3f2bf975788a1b70dff2eb5180ca395b28e (patch) | |
| tree | a3a297bc547ada3d3bdb973d58abb391866ecc96 /net/unix/af_unix.c | |
| parent | Merge tag 'iommu-updates-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | virtio_balloon: export hugetlb page allocation counts (diff) | |
| download | wireguard-linux-e241e3f2bf975788a1b70dff2eb5180ca395b28e.tar.xz wireguard-linux-e241e3f2bf975788a1b70dff2eb5180ca395b28e.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio update from Michael Tsirkin:
"This adds reporting hugepage stats to virtio-balloon"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_balloon: export hugetlb page allocation counts
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions