diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 04:58:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 04:58:27 +0300 |
| commit | e241e3f2bf975788a1b70dff2eb5180ca395b28e (patch) | |
| tree | a3a297bc547ada3d3bdb973d58abb391866ecc96 /security/keys | |
| parent | e5c372280b9cc1057647b4307757b7885a732a7e (diff) | |
| parent | 6c64fe7f2adcee21d7c4247f1ec021fd18428fc4 (diff) | |
| download | linux-e241e3f2bf975788a1b70dff2eb5180ca395b28e.tar.xz | |
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 'security/keys')
0 files changed, 0 insertions, 0 deletions