all.14.4.patch

[Niclas Zeising]

On 2012-04-21 20:56, Sevan / Venture37 wrote:
> Hi,
> The patches for sys/dev/drm/i915_suspend.c & i915_mem.c fail to apply to
> -HEAD src updated earlier today.
> 
> 
> Sevan

This is a FAQ.  See http://wiki.freebsd.org/Intel_GPU , specifically
I get a reject in i915_suspend.c.
The cause is that you use subversion-freebsd, which causes $FreeBSD$ tag
expansion in the checkout. Manually edit the i195_suspend.c before
applying the patch, to undo the expanded $FreeBSD$ tag into it short form.
I get a reject in i915_mem.c.
Remove this file, also remove i915_mem.c.rej, i915_mem.c.orig.

Regards!
-- 
Niclas