From: Maarten Lankhorst <dev@lankhorst.se>
Date: Mon, 9 Dec 2024 15:28:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
X-Git-Tag: v6.14-rc1~174^2~13^2~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33f029af89791f5d55cbfcb72a6c1b32a8905584;p=thirdparty%2Fkernel%2Flinux.git

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

The v6.13-rc2 release included a bunch of breaking changes,
specifically the MODULE_IMPORT_NS commit.

Backmerge in order to fix them before the next pull-request.

Include the fix from Stephen Roswell.

Caused by commit

  25c3fd1183c0 ("drm/virtio: Add a helper to map and note the dma addrs and lengths")

Interacting with commit

  cdd30ebb1b9f ("module: Convert symbol namespace to string literal")

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://patchwork.freedesktop.org/patch/msgid/20241209121717.2abe8026@canb.auug.org.au
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---

33f029af89791f5d55cbfcb72a6c1b32a8905584
diff --cc drivers/gpu/drm/virtio/virtgpu_prime.c
index 688810d1b6112,44425f20d91aa..b3664c12843d8
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@@ -27,8 -27,6 +27,8 @@@
  
  #include "virtgpu_drv.h"
  
- MODULE_IMPORT_NS(DMA_BUF);
++MODULE_IMPORT_NS("DMA_BUF");
 +
  static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
  				   uuid_t *uuid)
  {