Date: Sun, 22 Apr 2012 00:12:16 +0200 From: Niclas Zeising <zeising@daemonic.se> To: Sevan / Venture37 <venture37@gmail.com> Cc: freebsd-x11@freebsd.org Subject: Re: all.14.4.patch Message-ID: <4F9330C0.7080701@daemonic.se> In-Reply-To: <4F9302F8.40108@gmail.com> References: <4F9302F8.40108@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F9330C0.7080701>