Pending MFC of drm updates

[Scot Hetzel]

On Tue, Jan 6, 2009 at 6:24 PM, Torfinn Ingolfsen
<torfinn.ingolfsen at broadpark.no> wrote:
> On Tue, 06 Jan 2009 12:36:20 -0500
> Robert Noland <rnoland at FreeBSD.org> wrote:
>
>> I am planning to merge most all of the drm from -CURRENT to releng_7
>> shortly.  The merge that I have staged includes the following.
>>
:
>> I have a patch available for testing at
>> http://people.freebsd.org/~rnoland/drm-update-7-010609.patch.bz2
>
> Applied fine to my RELENG_7 / amd64 system (freshly cvsup'ed and built
> yesterday):
> root at kg-v2# uname -a
> FreeBSD kg-v2.kg4.no 7.1-STABLE FreeBSD 7.1-STABLE #1: Tue Jan  6
> 21:49:31 CET 2009 root at kg-v2.kg4.no:/usr/obj/usr/src/sys/GENERIC  amd64
>
> - except for the patch to sys/modules/drm/i915/Makefile:
:
> Apparently patch gets confuseed when it finds a file with the same name
> in the current directory (which was /usr/src), or perhaps I don't know
> how to tell patch how to find the right file.
> I just did:
> cd /usr/src
> patch < /dir/name/patchfile
>
use:

patch -p0 < /dir/name/patchfile

See the man page on patch.

Scot.