![]() Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> |
||
---|---|---|
.. | ||
agp.h | ||
ali-agp.c | ||
alpha-agp.c | ||
amd-k7-agp.c | ||
amd64-agp.c | ||
ati-agp.c | ||
backend.c | ||
compat_ioctl.c | ||
compat_ioctl.h | ||
efficeon-agp.c | ||
frontend.c | ||
generic.c | ||
hp-agp.c | ||
i460-agp.c | ||
intel-agp.c | ||
intel-agp.h | ||
intel-gtt.c | ||
isoch.c | ||
Kconfig | ||
Makefile | ||
nvidia-agp.c | ||
parisc-agp.c | ||
sgi-agp.c | ||
sis-agp.c | ||
sworks-agp.c | ||
uninorth-agp.c | ||
via-agp.c |