OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d82afcf
6ee1d74
)
Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Dave Airlie
<airlied@redhat.com>
Mon, 25 Jan 2021 04:35:44 +0000
(14:35 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 25 Jan 2021 04:35:44 +0000
(14:35 +1000)
Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around.
Signed-off-by: Dave Airlie <airlied@redhat.com>
16 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/configs/omap2plus_defconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/dma-buf/dma-buf.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_atomic_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_plane.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/display/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/vgpu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/msm/msm_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_ttm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/vc4/vc4_hdmi.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
arch/arm/configs/omap2plus_defconfig
Simple merge
diff --cc
drivers/dma-buf/dma-buf.c
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
Simple merge
diff --cc
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
Simple merge
diff --cc
drivers/gpu/drm/drm_atomic_helper.c
Simple merge
diff --cc
drivers/gpu/drm/drm_plane.c
Simple merge
diff --cc
drivers/gpu/drm/i915/display/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/vgpu.c
Simple merge
diff --cc
drivers/gpu/drm/msm/msm_gem.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge
diff --cc
drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge