From owner-freebsd-x11@FreeBSD.ORG  Tue Feb  7 00:52:37 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0986B106566B;
	Tue,  7 Feb 2012 00:52:37 +0000 (UTC)
	(envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
	by mx1.freebsd.org (Postfix) with ESMTP id BA4F48FC0A;
	Tue,  7 Feb 2012 00:52:36 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
	by wonkity.com (8.14.5/8.14.5) with ESMTP id q170H2JL081135;
	Mon, 6 Feb 2012 17:17:02 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
	by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q170H2ZK081132;
	Mon, 6 Feb 2012 17:17:02 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Date: Mon, 6 Feb 2012 17:17:02 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Martin Wilke <miwi@freebsd.org>
In-Reply-To: <20120206014536.7ece944b.miwi@FreeBSD.org>
Message-ID: <alpine.BSF.2.00.1202061703110.80943@wonkity.com>
References: <20120206014536.7ece944b.miwi@FreeBSD.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
	(wonkity.com [127.0.0.1]); Mon, 06 Feb 2012 17:17:02 -0700 (MST)
Cc: x11@freebsd.org
Subject: Re: [CFT] Xorg Upgrade 7.5.2
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Feb 2012 00:52:37 -0000

On Mon, 6 Feb 2012, Martin Wilke wrote:

> 9-STABLE Users:
> 'meowthink' is currently maintaining the backport to 9 STABLE.
> Make sure you have the latest FreeBSD 9-STABLE source.
> Get the patch from here:
> https://docs.google.com/leaf?id=0BxbPi2OX4_B-NWY3NWU3MzEtNDBjYy00NTljLThlZGItMWFlYjIyYjI4Yjk3&hl=en_US
>
> Rebuild your Kernel and reboot.
>
> Known issuse:
> There will be a patch reject in the sys/dev/drm/i915_suspend.c file.
> The solution is to manually undo the expansion of the $FreeBSD: ....$
> tag, so it only saysis $FreeBSD$.

Seems like this step could be before the previous one.  Anyway, I see
more than one patch reject with a 9-stable from minutes ago

sys/modules/drm/drm/Makefile
sys/modules/drm/i915/Makefile
sys/dev/drm/i915_suspend.c