diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-01 21:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-01 21:49:45 -0400 |
| commit | fec345baa52e01e05c8c05c04a358b4105445e23 (patch) | |
| tree | effeddf006b6d68b4fd69a93b212910bad21c1ed | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
| parent | 8a7b19d8b542b87bccc3eaaf81dcc90a5ca48aea (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fix from Michael Tsirkin:
"Last-minute virtio fix for 4.1
This tweaks an exported user-space header to fix build breakage for
userspace using it"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h
| -rw-r--r-- | include/uapi/linux/virtio_balloon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index 984169a819ee..d7f1cbc3766c 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 | * SUCH DAMAGE. */ | 27 | * SUCH DAMAGE. */ |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/virtio_types.h> | ||
| 29 | #include <linux/virtio_ids.h> | 30 | #include <linux/virtio_ids.h> |
| 30 | #include <linux/virtio_config.h> | 31 | #include <linux/virtio_config.h> |
| 31 | 32 | ||