git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 14 Dec 2021 08:43:25 +0000 (09:43 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 14 Dec 2021 09:24:28 +0000 (10:24 +0100)
commit	c4ba0757007a03cc1a8cad907904e66e1401e5a2
tree	8773b8cbab631258b561ddb3d9b219072095bee4	tree \| snapshot
parent	fbaf60259eb5fbb53386b5b74c4454629d25cd50	commit \| diff
parent	f4faf532b51b095af557f2b8dce62f42101c8b01	commit \| diff

Merge v5.16-rc5 into drm-next

Thomas Zimmermann requested a fixes backmerge, specifically also for
fcff600d1567 ("drm/vc4: fix error code in vc4_create_object()")

Just a bunch of adjacent changes conflicts, even the big pile of them
in vc4.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

28 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_svm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_link.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_link.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_gem_shmem_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display_types.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_request.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/lima/lima_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/dsi/dsi_host.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/xen/xen_drm_front.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/console/vgacon.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_svm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_link.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_link.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_gem_shmem_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display_types.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_request.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/lima/lima_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/dsi/dsi_host.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/xen/xen_drm_front.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/console/vgacon.c	diff1 \|	diff2 \|	blob \| history