diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-01 10:41:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-01 10:42:09 +1000 |
| commit | c62098c991a835903a31b5e135fe4f08b86bd603 (patch) | |
| tree | 3b51a40309a0e192c755f0932d82216df132aacf /include/linux | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| parent | 6f49c2515e2258f08f2b905c9772dbf729610415 (diff) | |
Merge tag 'drm-misc-fixes-2020-04-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A few resources-related fixes for qxl, some doc build warnings and ioctl
fixes for dma-buf, an off-by-one fix in edid, and a return code fix in
DP-MST
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430153201.wx6of2b2gsoip7bk@gilmour.lan
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-buf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 1ade486fc2bb..57bcef6f988a 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -329,13 +329,12 @@ struct dma_buf { /** * struct dma_buf_attach_ops - importer operations for an attachment - * @move_notify: [optional] notification that the DMA-buf is moving * * Attachment operations implemented by the importer. */ struct dma_buf_attach_ops { /** - * @move_notify + * @move_notify: [optional] notification that the DMA-buf is moving * * If this callback is provided the framework can avoid pinning the * backing store while mappings exists. |