git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

author	Dave Airlie <airlied@redhat.com>
	Wed, 28 Mar 2018 04:30:41 +0000 (14:30 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Wed, 28 Mar 2018 04:30:41 +0000 (14:30 +1000)
commit	2b4f44eec2be2688511c2b617d0e1b4f94c45ba4
tree	533c03602f4ae6d6404db6fa56c88e6f83e1bebe	tree \| snapshot
parent	33d009cd889490838c5db9b9339856c9e3d3facc	commit \| diff
parent	3eb2ce825ea1ad89d20f7a3b5780df850e4be274	commit \| diff

Backmerge tag 'v4.16-rc7' into drm-next

Linux 4.16-rc7

This was requested by Daniel, and things were getting
a bit hard to reconcile, most of the conflicts were
trivial though.

36 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_mm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_probe_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/kvmgt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/mmio_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hangcheck.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_rgb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_mm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_probe_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/kvmgt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/mmio_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hangcheck.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_rgb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	diff1 \|	diff2 \|	blob \| history