From owner-svn-src-stable-7@FreeBSD.ORG Thu Jul 23 01:58:54 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FAA31065677; Thu, 23 Jul 2009 01:58:54 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id 039F48FC18; Thu, 23 Jul 2009 01:58:53 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 2FA143BC6C8; Wed, 22 Jul 2009 21:41:08 -0400 (EDT) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 22 Jul 2009 21:41:08 -0400 X-Sasl-enc: +htrv0Kvw6mwTzPh8fSptQnHjKFdJR/PiTZs9Cl8YRuN 1248313267 Received: from [192.168.123.18] (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTPSA id 4FB552B9F1; Wed, 22 Jul 2009 21:41:07 -0400 (EDT) Message-ID: <4A67BFB1.40904@incunabulum.net> Date: Thu, 23 Jul 2009 02:41:05 +0100 From: Bruce Simpson User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: Bruce M Simpson References: <200907230135.n6N1ZEar057595@svn.freebsd.org> In-Reply-To: <200907230135.n6N1ZEar057595@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2009 01:58:54 -0000 Hi all, I haven't updated the mergeinfo for this file, as the USB stack in HEAD has been completely replaced with the new USB stack. If this is desired, please let me know how to proceed -- I'm new to mergeinfo. When I used the following command to try to maintain the mergeinfo information, I got a very large list of revisions, not all of which look as though they should be merged for this file: % svn merge --record-only -c182138 $FSVN/head/sys/dev/usb/uipaq.c@182138 uipaq.c If I omit the @182138 from the above command, the resultant mergeinfo is empty. thanks, BMS P.S. I tested the code in this commit with an HP iPaq 2215 and it appears to work fine.