History

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

Linus Torvalds committed 4 years ago

Commit feb9c5e2 parents 9be9ed2 7ff960a1 file · +7 −7Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/linux/virtio_ids.h+7−7
@@ -73,12 +73,12 @@ · 72 unmodified lines
7373 * Virtio Transitional IDs
7474 */
7575
76−#define VIRTIO_TRANS_ID_NET 1000 /* transitional virtio net */
77−#define VIRTIO_TRANS_ID_BLOCK 1001 /* transitional virtio block */
78−#define VIRTIO_TRANS_ID_BALLOON 1002 /* transitional virtio balloon */
79−#define VIRTIO_TRANS_ID_CONSOLE 1003 /* transitional virtio console */
80−#define VIRTIO_TRANS_ID_SCSI 1004 /* transitional virtio SCSI */
81−#define VIRTIO_TRANS_ID_RNG 1005 /* transitional virtio rng */
82−#define VIRTIO_TRANS_ID_9P 1009 /* transitional virtio 9p console */
76+#define VIRTIO_TRANS_ID_NET 0x1000 /* transitional virtio net */
77+#define VIRTIO_TRANS_ID_BLOCK 0x1001 /* transitional virtio block */
78+#define VIRTIO_TRANS_ID_BALLOON 0x1002 /* transitional virtio balloon */
79+#define VIRTIO_TRANS_ID_CONSOLE 0x1003 /* transitional virtio console */
80+#define VIRTIO_TRANS_ID_SCSI 0x1004 /* transitional virtio SCSI */
81+#define VIRTIO_TRANS_ID_RNG 0x1005 /* transitional virtio rng */
82+#define VIRTIO_TRANS_ID_9P 0x1009 /* transitional virtio 9p console */
8383
8484 #endif /* _LINUX_VIRTIO_IDS_H */