]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <dev@lankhorst.se>
Mon, 9 Dec 2024 15:28:17 +0000 (16:28 +0100)
committerMaarten Lankhorst <dev@lankhorst.se>
Mon, 9 Dec 2024 15:35:21 +0000 (16:35 +0100)
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>
57 files changed:
1  2 
MAINTAINERS
drivers/accel/qaic/qaic_drv.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/arm/display/komeda/komeda_drv.c
drivers/gpu/drm/arm/hdlcd_drv.c
drivers/gpu/drm/arm/malidp_drv.c
drivers/gpu/drm/armada/armada_drv.c
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
drivers/gpu/drm/display/drm_dp_mst_topology.c
drivers/gpu/drm/etnaviv/etnaviv_drv.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
drivers/gpu/drm/imagination/pvr_drv.c
drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
drivers/gpu/drm/imx/lcdc/imx-lcdc.c
drivers/gpu/drm/ingenic/ingenic-drm-drv.c
drivers/gpu/drm/kmb/kmb_drv.c
drivers/gpu/drm/lima/lima_drv.c
drivers/gpu/drm/logicvc/logicvc_drm.c
drivers/gpu/drm/mcde/mcde_drv.c
drivers/gpu/drm/mediatek/mtk_drm_drv.c
drivers/gpu/drm/meson/meson_drv.c
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/mxsfb/lcdif_drv.c
drivers/gpu/drm/mxsfb/mxsfb_drv.c
drivers/gpu/drm/omapdrm/omap_drv.c
drivers/gpu/drm/panel/panel-edp.c
drivers/gpu/drm/panfrost/panfrost_drv.c
drivers/gpu/drm/panthor/panthor_drv.c
drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
drivers/gpu/drm/rockchip/cdn-dp-core.c
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
drivers/gpu/drm/solomon/ssd130x.c
drivers/gpu/drm/sprd/sprd_drm.c
drivers/gpu/drm/sti/sti_drv.c
drivers/gpu/drm/stm/drv.c
drivers/gpu/drm/sun4i/sun4i_drv.c
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
drivers/gpu/drm/tidss/tidss_drv.c
drivers/gpu/drm/tilcdc/tilcdc_drv.c
drivers/gpu/drm/tiny/arcpgu.c
drivers/gpu/drm/tiny/ofdrm.c
drivers/gpu/drm/tiny/simpledrm.c
drivers/gpu/drm/tve200/tve200_drv.c
drivers/gpu/drm/v3d/v3d_drv.c
drivers/gpu/drm/v3d/v3d_perfmon.c
drivers/gpu/drm/vc4/vc4_crtc.c
drivers/gpu/drm/vc4/vc4_drv.c
drivers/gpu/drm/vc4/vc4_hdmi.c
drivers/gpu/drm/vc4/vc4_hvs.c
drivers/gpu/drm/vc4/vc4_txp.c
drivers/gpu/drm/virtio/virtgpu_prime.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 688810d1b6112450f0f0bc69d1bac6a344a67c59,44425f20d91aa67999059f9f92b4a2f88e303d37..b3664c12843d8e717e7146e03c10db617d60d292
@@@ -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)
  {