Merge drm/drm-next into drm-misc-next

Backmerging to get new regmap APIs of v5.19-rc1.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/bridge/Kconfig
index c37dd0e964a4732df837e42baeabaf22b4672ac5,8ffd601e68f95742f278ff725239faeb7ad724fd..1afe99dac0ff2fb8a851662eb880a205cc6d7b82
--- 1/drivers/gpu/drm/bridge/Kconfig
--- 2/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@@ -92,9 -92,8 +92,10 @@@ config DRM_ITE_IT650
        select DRM_DISPLAY_HELPER
          select DRM_DP_AUX_BUS
          select DRM_KMS_HELPER
+         select DRM_DP_HELPER
          select EXTCON
 +        select CRYPTO
 +        select CRYPTO_HASH
          help
            ITE IT6505 DisplayPort bridge chip driver.
  

diff --cc drivers/gpu/drm/display/drm_dp_mst_topology.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_parser.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c
Simple merge

diff --cc drivers/video/fbdev/core/fbmem.c
Simple merge

diff --cc drivers/video/fbdev/efifb.c
Simple merge

diff --cc drivers/video/fbdev/simplefb.c
Simple merge

diff --cc include/drm/drm_edid.h
Simple merge

diff --cc include/uapi/linux/dma-buf.h
index 30fb8834aa3cb7af090aa07bcea218daeff07c51,b1523cb8ab307d7454160a5d5b3f1d1c0fc1b596..5a6fda66d9adf01438619e7e67fa69f0fec2d88d
--- 1/include/uapi/linux/dma-buf.h
--- 2/include/uapi/linux/dma-buf.h
+++ b/include/uapi/linux/dma-buf.h
@@@ -174,9 -92,7 +174,9 @@@ struct dma_buf_import_sync_file 
   * between them in actual uapi, they're just different numbers.
   */
  #define DMA_BUF_SET_NAME      _IOW(DMA_BUF_BASE, 1, const char *)
- #define DMA_BUF_SET_NAME_A    _IOW(DMA_BUF_BASE, 1, u32)
- #define DMA_BUF_SET_NAME_B    _IOW(DMA_BUF_BASE, 1, u64)
+ #define DMA_BUF_SET_NAME_A    _IOW(DMA_BUF_BASE, 1, __u32)
+ #define DMA_BUF_SET_NAME_B    _IOW(DMA_BUF_BASE, 1, __u64)
 +#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE        _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file)
 +#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE        _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file)
  
  #endif