Merge remote-tracking branch 'virtio/virtio-next'

diff --cc include/uapi/linux/virtio_console.h
index c312f16bc4e7e692f4117b0a9280cadf1977f8db,3fd0dce3cb25d2aa26caeb518caff2cdc3a9177b..ba260dd0b33aece9b8ba983b9914583ff7b48e6c
--- 1/include/uapi/linux/virtio_console.h
--- 2/include/uapi/linux/virtio_console.h
+++ b/include/uapi/linux/virtio_console.h
@@@ -38,8 -38,9 +38,9 @@@
  /* Feature bits */
  #define VIRTIO_CONSOLE_F_SIZE 0       /* Does host provide console size? */
  #define VIRTIO_CONSOLE_F_MULTIPORT 1  /* Does host provide multiple ports? */
+ #define VIRTIO_CONSOLE_F_EMERG_WRITE 2 /* Does host support emergency write? */
  
 -#define VIRTIO_CONSOLE_BAD_ID         (~(u32)0)
 +#define VIRTIO_CONSOLE_BAD_ID         (~(__u32)0)
  
  struct virtio_console_config {
        /* colums of the screens */