Commit feb9c5e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio fix from Michael Tsirkin:
 "A last minute fixup of the transitional ID numbers.

  Important to get these right - if users start to depend on the wrong
  ones they are very hard to fix"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: fix virtio transitional ids
parents 9be9ed26 7ff960a6

include/uapi/linux/virtio_ids.h

+7 −7
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ 
 * Virtio Transitional IDs

 */



#define VIRTIO_TRANS_ID_NET		1000 /* transitional virtio net */

#define VIRTIO_TRANS_ID_BLOCK		1001 /* transitional virtio block */

#define VIRTIO_TRANS_ID_BALLOON		1002 /* transitional virtio balloon */

#define VIRTIO_TRANS_ID_CONSOLE		1003 /* transitional virtio console */

#define VIRTIO_TRANS_ID_SCSI		1004 /* transitional virtio SCSI */

#define VIRTIO_TRANS_ID_RNG		1005 /* transitional virtio rng */

#define VIRTIO_TRANS_ID_9P		1009 /* transitional virtio 9p console */

#define VIRTIO_TRANS_ID_NET		0x1000 /* transitional virtio net */

#define VIRTIO_TRANS_ID_BLOCK		0x1001 /* transitional virtio block */

#define VIRTIO_TRANS_ID_BALLOON		0x1002 /* transitional virtio balloon */

#define VIRTIO_TRANS_ID_CONSOLE		0x1003 /* transitional virtio console */

#define VIRTIO_TRANS_ID_SCSI		0x1004 /* transitional virtio SCSI */

#define VIRTIO_TRANS_ID_RNG		0x1005 /* transitional virtio rng */

#define VIRTIO_TRANS_ID_9P		0x1009 /* transitional virtio 9p console */



#endif /* _LINUX_VIRTIO_IDS_H */