]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecd7963 acb1872)
BackMerge v4.18-rc7 into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 30 Jul 2018 00:39:22 +0000 (10:39 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 30 Jul 2018 00:39:22 +0000 (10:39 +1000)
commit3fce4618279373efc59a91adb16c11da46cd69e5
tree086fad6c9f260a0bcc9b6a3532c6cddc387dd907tree
parentecd7963f7cf967009882fd56eaee1e87a229bea2commit | diff
parentacb1872577b346bd15ab3a3f8dff780d6cca4b70commit | diff
BackMerge v4.18-rc7 into drm-next

rmk requested this for armada and I think we've had a few
conflicts build up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
26 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.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/dc.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c diff1 | diff2 | blob | history
drivers/gpu/drm/etnaviv/etnaviv_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/etnaviv/etnaviv_sched.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/cmd_parser.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/gtt.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/gtt.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/gvt.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/handlers.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/mmio.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/mmio_context.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/dispnv50/disp.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_connector.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_drm.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/sun4i/Makefile diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
include/linux/pci.h diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror