From owner-svn-src-stable-8@FreeBSD.ORG Mon Mar 1 19:48:11 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D78F51065670; Mon, 1 Mar 2010 19:48:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id A631E8FC1F; Mon, 1 Mar 2010 19:48:11 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 55AD646B52; Mon, 1 Mar 2010 14:48:11 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 80BA38A021; Mon, 1 Mar 2010 14:48:10 -0500 (EST) From: John Baldwin To: Alexander Motin Date: Mon, 1 Mar 2010 14:41:42 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201003011916.o21JGYkb092322@svn.freebsd.org> In-Reply-To: <201003011916.o21JGYkb092322@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201003011441.42742.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 01 Mar 2010 14:48:10 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.5 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r204528 - in stable/8: . contrib/top lib/libusb sbin/atacontrol sbin/camcontrol sys/cam sys/dev/ata tools/regression/lib/msun tools/regression/usr.bin/pkill tools/tools/ath/common tools... X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 19:48:12 -0000 On Monday 01 March 2010 2:16:34 pm Alexander Motin wrote: > Author: mav > Date: Mon Mar 1 19:16:34 2010 > New Revision: 204528 > URL: http://svn.freebsd.org/changeset/base/204528 > > Log: > MFC r204195: > Improve output for controllers that doesn't report SATA speed. > > Modified: > stable/8/sbin/atacontrol/atacontrol.c > stable/8/sbin/camcontrol/camcontrol.c > stable/8/sys/cam/cam_xpt.c > stable/8/sys/dev/ata/ata-all.c > stable/8/sys/dev/ata/ata-pci.c > stable/8/sys/dev/ata/ata-sata.c For future reference, it would probably be best to do these as three separate merges (to sbin/atacontrol, sbin/camcontrol, and sys) and then do one commit, at least to avoid extra mergeinfo churn. -- John Baldwin