Skip to content
  1. Feb 09, 2023
  2. Feb 04, 2023
  3. Feb 01, 2023
  4. Jan 31, 2023
    • Daniel Vetter's avatar
      Merge v6.2-rc6 into drm-next · aebd8f0c
      Daniel Vetter authored
      
      
      Due to holidays we started -next with more -fixes in-flight than
      usual, and people have been asking where they are. Backmerge to get
      things better in sync.
      
      Conflicts:
      - Tiny conflict in drm_fbdev_generic.c between variable rename and
        missing error handling that got added.
      - Conflict in drm_fb_helper.c between the added call to vgaswitcheroo
        in drm_fb_helper_single_fb_probe and a refactor patch that extracted
        lots of helpers and incidentally removed the dev local variable.
        Readd it to make things compile.
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      aebd8f0c