From owner-svn-src-stable@FreeBSD.ORG Tue Oct 14 20:47:29 2008 Return-Path: Delivered-To: svn-src-stable@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DE0B1065696; Tue, 14 Oct 2008 20:47:29 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.delphij.net (delphij-pt.tunnel.tserv2.fmt.ipv6.he.net [IPv6:2001:470:1f03:2c9::2]) by mx1.freebsd.org (Postfix) with ESMTP id D50CD8FC14; Tue, 14 Oct 2008 20:47:28 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [211.166.10.233]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.delphij.net (Postfix) with ESMTPS id 0A84228454; Wed, 15 Oct 2008 04:47:28 +0800 (CST) Received: from localhost (tarsier.geekcn.org [211.166.10.233]) by tarsier.geekcn.org (Postfix) with ESMTP id 72EF8101DE1A; Wed, 15 Oct 2008 04:47:27 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([211.166.10.233]) by localhost (mail.geekcn.org [211.166.10.233]) (amavisd-new, port 10024) with ESMTP id ZCM4BKwqHhB4; Wed, 15 Oct 2008 04:47:22 +0800 (CST) Received: from charlie.delphij.net (adsl-76-237-33-62.dsl.pltn13.sbcglobal.net [76.237.33.62]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id D605A101B2B4; Wed, 15 Oct 2008 04:47:18 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:references:in-reply-to: x-enigmail-version:openpgp:content-type:content-transfer-encoding; b=I2Y31FIEKpWT5XGRXbseiRf6Z+FXmrdkiC14sMrzHQS9sagUvIvlv5FcoUbqWhtXq WxRVPaK6fIsye7ykcZaCA== Message-ID: <48F50552.7070507@delphij.net> Date: Tue, 14 Oct 2008 13:47:14 -0700 From: Xin LI Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.17 (X11/20080928) MIME-Version: 1.0 To: John Baldwin References: <200810141902.m9EJ2lKt013833@svn.freebsd.org> <200810141616.27776.jhb@freebsd.org> In-Reply-To: <200810141616.27776.jhb@freebsd.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=18EDEBA0; url=http://www.delphij.net/delphij.asc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable-7@FreeBSD.ORG, svn-src-stable@FreeBSD.ORG, svn-src-all@FreeBSD.ORG, src-committers@FreeBSD.ORG, Xin LI Subject: Re: svn commit: r183892 - stable/7/sys/dev/twa X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 20:47:29 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 John Baldwin wrote: > On Tuesday 14 October 2008 03:02:47 pm Xin LI wrote: >> Author: delphij >> Date: Tue Oct 14 19:02:47 2008 >> New Revision: 183892 >> URL: http://svn.freebsd.org/changeset/base/183892 >> >> Log: >> MFC r183660: Limit DMA memory to lower addressable 4GB, without >> this patch, we can reliably provoke data corruption on systems >> equipped with a plenty of memory during high load. >> >> Approved by: re (kib) >> >> Modified: >> stable/7/sys/dev/twa/ (props changed) >> stable/7/sys/dev/twa/tw_osl_freebsd.c > > Need to re-merge this to stable/7/sys to move the merge info up to sys and out > of sys/dev/twa. Sorry for that. Seems that David Malone has committed a merge on sys/ which already collapsed the mergeinfo? Cheers, - -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEARECAAYFAkj1BVEACgkQi+vbBBjt66D2QQCcC52AesgNxP0IDgH9LtMPzQ26 xX8An13BAPJax/5/D7LxyN1MowCGL67j =NF1s -----END PGP SIGNATURE-----