]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc56d29 22f59aa)
Backmerge tag 'v4.14-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 02:40:41 +0000 (12:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 02:40:41 +0000 (12:40 +1000)
commit4498426626c5a125e69b07a82650dc9356b7dd5c
tree826df7ac42ca13c33828d0142046186b91df686btree | snapshot
parentcc56d29a0f3b3685206376115983574b231ffa74commit | diff
parent22f59aa048992942f3ea633fd1c02b9731a4dcc1commit | diff
Backmerge tag 'v4.14-rc7' into drm-next

Linux 4.14-rc7

Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
18 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/cmd_parser.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/execlist.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/scheduler.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_evict.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_perf.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_reg.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_bios.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ddi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_engine_cs.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_pm.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/dsi/dsi_host.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/msm_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/msm_rd.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.