diff options
| author | David Ahern <dsahern@kernel.org> | 2023-11-22 19:38:34 +0000 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2023-11-22 19:38:34 +0000 |
| commit | f441c022218f6a3526e0bd5140229ea2919ee35c (patch) | |
| tree | bd9e158cada557c5ea2593cb260e9e9a3b5ad23f /include | |
| parent | 27fa7cc40030e246803518d073d63705cda29af6 (diff) | |
| parent | f7a587583263843cb6314eaebf65049163fae0ed (diff) | |
| download | iproute2-f441c022218f6a3526e0bd5140229ea2919ee35c.tar.gz | |
Merge branch 'main' into next
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/virtio_config.h | 5 | ||||
| -rw-r--r-- | include/version.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 94a301954..8c3f151d7 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -103,6 +103,11 @@ */ #define VIRTIO_F_NOTIFICATION_DATA 38 +/* This feature indicates that the driver uses the data provided by the device + * as a virtqueue identifier in available buffer notifications. + */ +#define VIRTIO_F_NOTIF_CONFIG_DATA 39 + /* * This feature indicates that the driver can reset a queue individually. */ diff --git a/include/version.h b/include/version.h index b038910c6..298dc7b9b 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -static const char version[] = "6.5.0"; +static const char version[] = "6.6.0"; |