summaryrefslogtreecommitdiffstats
path: root/fs/ufs/balloc.c
diff options
context:
space:
mode:
authorLinus Torvalds2015-09-09 19:37:41 +0200
committerLinus Torvalds2015-09-09 19:37:41 +0200
commitdaf0e1ed578f65e8395102549e135887e6661860 (patch)
tree72d0a515fcbc0f8f5039a30139edf738e11b6063 /fs/ufs/balloc.c
parentMerge tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff)
parentvirtio_balloon: do not change memory amount visible via /proc/meminfo (diff)
downloadkernel-qcow2-linux-daf0e1ed578f65e8395102549e135887e6661860.tar.gz
kernel-qcow2-linux-daf0e1ed578f65e8395102549e135887e6661860.tar.xz
kernel-qcow2-linux-daf0e1ed578f65e8395102549e135887e6661860.zip
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin: "Virtio fixes and features for 4.3: - virtio-mmio can now be auto-loaded through acpi. - virtio blk supports extended partitions. - total memory is better reported when using virtio balloon with auto-deflate. - cache control is re-enabled when using virtio-blk in modern mode" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio_balloon: do not change memory amount visible via /proc/meminfo virtio_ballon: change stub of release_pages_by_pfn virtio-blk: Allow extended partitions virtio_mmio: add ACPI probing virtio-blk: use VIRTIO_BLK_F_WCE and VIRTIO_BLK_F_CONFIG_WCE in virtio1
Diffstat (limited to 'fs/ufs/balloc.c')
0 files changed, 0 insertions, 0 deletions