Skip to content
  • Dave Airlie's avatar
    Merge remote-tracking branch 'origin/master' into drm-next · 281d1bbd
    Dave Airlie authored
    Backmerge Linus tree after rc5 + drm-fixes went in.
    
    There were a few amdkfd conflicts I wanted to avoid,
    and Ben requested this for nouveau also.
    
    Conflicts:
    	drivers/gpu/drm/amd/amdkfd/Makefile
    	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
    	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
    	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
    	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
    	drivers/gpu/drm/i915/intel_runtime_pm.c
    	drivers/gpu/drm/radeon/radeon_kfd.c
    281d1bbd