From: Daniel Vetter Date: Mon, 22 Oct 2012 12:34:51 +0000 (+0200) Subject: Merge tag 'v3.7-rc2' into drm-intel-next-queued X-Git-Tag: v3.8-rc1~82^2~192^2~159 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2fb7916927e989ea424e61ce5fe617e54878827;p=pandora-kernel.git Merge tag 'v3.7-rc2' into drm-intel-next-queued Linux 3.7-rc2 Backmerge to solve two ugly conflicts: - uapi. We've already added new ioctl definitions for -next. Do I need to say more? - wc support gtt ptes. We've had to revert this for snb+ for 3.7 and also fix a few other things in the code. Now we know how to make it work on snb+, but to avoid losing the other fixes do the backmerge first before re-enabling wc gtt ptes on snb+. And a few other minor things, among them git getting confused in intel_dp.c and seemingly causing a conflict out of nothing ... Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_modes.c include/drm/i915_drm.h Signed-off-by: Daniel Vetter --- c2fb7916927e989ea424e61ce5fe617e54878827 Reading git-diff-tree failed