From owner-freebsd-usb@FreeBSD.ORG  Mon Oct 26 14:45:37 2009
Return-Path: <owner-freebsd-usb@FreeBSD.ORG>
Delivered-To: freebsd-usb@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 890D9106566C;
	Mon, 26 Oct 2009 14:45:37 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (unknown [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 49CA48FC1C;
	Mon, 26 Oct 2009 14:45:37 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id n9QEh5K5075101;
	Mon, 26 Oct 2009 08:43:05 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Mon, 26 Oct 2009 08:43:16 -0600 (MDT)
Message-Id: <20091026.084316.35218995.imp@bsdimp.com>
To: des@des.no
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <86aazecl00.fsf@ds4.des.no>
References: <86skd6cmm8.fsf@ds4.des.no>
	<20091026.073759.2130803790.imp@bsdimp.com>
	<86aazecl00.fsf@ds4.des.no>
X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: freebsd-hackers@FreeBSD.org, hackers@FreeBSD.org, freebsd-usb@FreeBSD.org
Subject: Re: Help troubleshooting...
X-BeenThere: freebsd-usb@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: FreeBSD support for USB <freebsd-usb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-usb>
List-Post: <mailto:freebsd-usb@freebsd.org>
List-Help: <mailto:freebsd-usb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Oct 2009 14:45:37 -0000

In message: <86aazecl00.fsf@ds4.des.no>
            Dag-Erling_Sm=F8rgrav <des@des.no> writes:
: "M. Warner Losh" <imp@bsdimp.com> writes:
: > Yes.  Of course I have local modifications, but none in the usb sta=
ck.
: > But I've also done a svn update from the top of the tree multiple
: > times and this version number persists.
: =

: Weird.  r185338 was a commit to the old USB stack.  Try to run
: svnversion in sys/dev/usb, and in an unrelated directory such as
: sys/conf.  If there's a difference, run svn stat in sys/dev/usb and s=
ee
: if anything unexpected shows up.

% cd sys/dev/usb
% svnversion
198411M
% cd ../../conf
% svnversion
198411M

Some more digging down this line shows that there was a dangling merge
conflict in sys/i386/conf/GENERIC

Warner