Date: Mon, 26 Oct 2009 08:43:16 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: des@des.no Cc: freebsd-hackers@FreeBSD.org, hackers@FreeBSD.org, freebsd-usb@FreeBSD.org, hselasky@c2i.net Subject: Re: Help troubleshooting... Message-ID: <20091026.084316.35218995.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091026.084316.35218995.imp>