diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-07-21 00:05:03 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-21 00:52:55 +0200 |
| commit | 59be3baa8dff271d48500e009622318badfc7140 (patch) | |
| tree | d7fde1af4197df9ece8ca26fb492051df2ef80f1 /drivers/gpu/drm/nouveau/nouveau_chan.h | |
| parent | tcp: add TCP_OLD_SEQUENCE drop reason (diff) | |
| parent | Merge tag 'net-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-59be3baa8dff271d48500e009622318badfc7140.tar.xz linux-59be3baa8dff271d48500e009622318badfc7140.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h index e06a8ffed31a..bad7466bd0d5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.h +++ b/drivers/gpu/drm/nouveau/nouveau_chan.h @@ -53,6 +53,7 @@ struct nouveau_channel { u32 user_put; struct nvif_object user; + struct nvif_object blit; struct nvif_event kill; atomic_t killed; |