mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-16 03:37:05 +00:00
281d1bbd34
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 |
||
|---|---|---|
| .. | ||
| cik_regs.h | ||
| Kconfig | ||
| kfd_chardev.c | ||
| kfd_crat.h | ||
| kfd_device.c | ||
| kfd_device_queue_manager.c | ||
| kfd_device_queue_manager.h | ||
| kfd_device_queue_manager_cik.c | ||
| kfd_device_queue_manager_vi.c | ||
| kfd_doorbell.c | ||
| kfd_flat_memory.c | ||
| kfd_kernel_queue.c | ||
| kfd_kernel_queue.h | ||
| kfd_kernel_queue_cik.c | ||
| kfd_kernel_queue_vi.c | ||
| kfd_module.c | ||
| kfd_mqd_manager.c | ||
| kfd_mqd_manager.h | ||
| kfd_mqd_manager_cik.c | ||
| kfd_mqd_manager_vi.c | ||
| kfd_packet_manager.c | ||
| kfd_pasid.c | ||
| kfd_pm4_headers.h | ||
| kfd_pm4_opcodes.h | ||
| kfd_priv.h | ||
| kfd_process.c | ||
| kfd_process_queue_manager.c | ||
| kfd_queue.c | ||
| kfd_topology.c | ||
| kfd_topology.h | ||
| Makefile | ||