diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2025-05-26 21:32:29 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2025-05-26 21:33:52 +0300 |
| commit | ef2233850edc4cc0d5fc6136fcdb004a1ddfa7db (patch) | |
| tree | 8ccfb0731d7ddf7d384c37b56ee15a22db025c0a /include/uapi/linux/vhost.h | |
| parent | 260ce16e579d375ba8f1ac945308343522f98d50 (diff) | |
| parent | 0ff41df1cb268fc69e703a08a57ee14ae967d0ca (diff) | |
| download | linux-ef2233850edc4cc0d5fc6136fcdb004a1ddfa7db.tar.xz | |
Merge tag 'v6.15' into rdma.git for-next
Following patches need the RDMA rc branch since we are past the RC cycle
now.
Merge conflicts resolved based on Linux-next:
- For RXE odp changes keep for-next version and fixup new places that
need to call is_odp_mr()
https://lore.kernel.org/r/20250422143019.500201bd@canb.auug.org.au
https://lore.kernel.org/r/20250514122455.3593b083@canb.auug.org.au
- irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info
change from for-next
https://lore.kernel.org/r/20250513130630.280ee6c5@canb.auug.org.au
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'include/uapi/linux/vhost.h')
| -rw-r--r-- | include/uapi/linux/vhost.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index b95dd84eef2d..d4b3e2ae1314 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -28,10 +28,10 @@ /* Set current process as the (exclusive) owner of this file descriptor. This * must be called before any other vhost command. Further calls to - * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */ + * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */ #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01) /* Give up ownership, and reset the device to default values. - * Allows subsequent call to VHOST_OWNER_SET to succeed. */ + * Allows subsequent call to VHOST_SET_OWNER to succeed. */ #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02) /* Set up/modify memory layout */ |